*** empty log message ***

diff --git a/appli/creaNewProject/CMakeLists.txt b/appli/creaNewProject/CMakeLists.txt
index 153ba4bd4d77727ddcd33993ccd6b9ce905fd9be..892756f7e0866215f9c8bc427e871589e76d9176 100644 (file)
--- a/appli/creaNewProject/CMakeLists.txt
+++ b/appli/creaNewProject/CMakeLists.txt
@@ -6,7 +6,7 @@ SET(EXE_NAME creaNewProject)
 SET(${EXE_NAME}_SOURCES creaNewProject.cpp)
 SET(${EXE_NAME}_HAS_GUI TRUE)
 SET(${EXE_NAME}_CONSOLE FALSE)
-SET(${EXE_NAME}_LINK_LIBRARIES crea )
+SET(${EXE_NAME}_LINK_LIBRARIES crea)
 
 CREA_ADD_EXECUTABLE( ${EXE_NAME} )
 #============================================================================

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index bd7cfb49d8e701a896a0534a238706cb3d6a8c1d..546f37b11595d1621e409dab16e40b59c2c59fd0 100644 (file)
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -20,14 +20,17 @@ ENDIF(USE_CREA)
 
 #-----------------------------------------------------------------------------
 IF(USE_QT4)
-  IF(NOT QT_FOUND)
-    FIND_PACKAGE(Qt4 REQUIRED)
+  IF(NOT QT_FOUND)     
+  
+       INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseQt.cmake)
+       
     IF(QT_FOUND)
       MESSAGE ( STATUS "=======================================")
       MESSAGE ( STATUS "Looking for QT4... found")
       MESSAGE ( STATUS "* Inc Dir = ${QT_INCLUDE_DIR}")
       MESSAGE ( STATUS "* Version = ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}")
       INCLUDE(${QT_USE_FILE})
+        
       CREA_DEFINE( USE_QT )
     #    SET(QT_LIBRARIES
     #      ${QT_LIBRARIES}
@@ -245,7 +248,7 @@ ENDIF(USE_LATEX)
 #-----------------------------------------------------------------------------
 IF(USE_TTH) 
   IF (NOT TTH_EXECUTABLE)
-    FIND_FILE( TTH_EXECUTABLE NAME tth tth.exe PATHS . $ENV{CREATIS}/tth_exe/ ~/Creatis/tth ~/Creatis/tth_linux)
+    FIND_FILE( TTH_EXECUTABLE NAME tth tth.exe PATHS . $ENV{CREATIS}/tth_exe/ ~/Creatis/tth ~/Creatis/tth_linux $ENV{CREATIS}/tth/) 
     IF (NOT TTH_EXECUTABLE)
       MESSAGE(FATAL_ERROR "TTH not found (LATEX_tth_CONVERTER). Required to build the HTML documentation from tex source")
     ELSE (NOT  TTH_EXECUTABLE)
@@ -269,36 +272,39 @@ IF(USE_BOOST)
           
       CREA_DEFINE( USE_BOOST )
          IF(WIN32)
-               LINK_DIRECTORIES( ${Boost_INCLUDE_DIRS}/lib)
+               LINK_DIRECTORIES( ${Boost_INCLUDE_DIRS}/stage/lib)
                #MESSAGE ("EED " ${Boost_LIBRARY_DIRS})
+               #libboost_signals-vc71-mt-1_37
+               #libboost_filesystem-vc71-mt-1_37
+               #boost_date_time-vc71-mt-1_37
                SET(BOOST_LIBRARIES
-                   libboost_signals-vc71-mt-1_37
-                   libboost_filesystem-vc71-mt-1_37
-                   boost_date_time-vc71-mt-1_37
+                               boost_signals-vc90-mt                
+                boost_filesystem-vc90-mt
+                boost_date_time-vc90-mt
                   
                   #what about boost_thread? JPR
            )
          ENDIF(WIN32)
       IF(NOT WIN32)
        IF(NOT APPLE)
-         SET(BOOST_LIBRARIES
-           boost_signals
-           boost_filesystem
-            boost_date_time
-           boost_program_options
-           boost_regex
-           boost_thread
-           )
+                 SET(BOOST_LIBRARIES
+                       boost_signals
+                       boost_filesystem
+                               boost_date_time
+                       boost_program_options
+                       boost_regex
+                       boost_thread
+                       )
        ELSE(NOT APPLE)
-         SET(BOOST_LIBRARIES
-           boost_signals-mt
-           boost_filesystem-mt
-           boost_date_time-mt
-            boost_system-mt
-           boost_program_options-mt
-           boost_regex-mt
-           boost_thread-mt         
-           )
+                 SET(BOOST_LIBRARIES
+                       boost_signals-mt
+                       boost_filesystem-mt
+                       boost_date_time-mt
+                               boost_system-mt
+                       boost_program_options-mt
+                       boost_regex-mt
+                       boost_thread-mt     
+                       )
        ENDIF(NOT APPLE)        
       ENDIF(NOT WIN32)
          

diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index 61dff385eca3883c650840f71953b6c16cd7ca42..9124fc6bec410300f60e353369d9f4c7e5cca54f 100644 (file)
--- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake
+++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
@@ -12,7 +12,7 @@ MACRO(CREA_FIND_WXWIDGETS)
     
     #wxWidgets build related stuff
     # DO NOT FORCE DEBUG LIBS !!
-    #SET(WXW_USE_DEBUG ON)
+    SET(WXW_USE_DEBUG ON)
     SET(WXW_USE_UNICODE OFF)
     SET(WXW_USE_SHARED ON)
     SET(WXW_USE_UNIV OFF)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e4862f22afc58f8d7015718980e4eb769ea91a5a..b02dbc974aae98a2ae717576ad3ae5bd712c62ba 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,12 +46,12 @@ CREA_DEFINE(CREA_EXPORT_SYMBOLS)
 
 ADD_LIBRARY(crea ${CREA_BUILD_SHARED} ${SRCS})
 
-
 TARGET_LINK_LIBRARIES(crea
   ${WXWIDGETS_LIBRARIES}
   ${VTK_LIBRARIES}
-  ${BOOST_LIBRARIES}
+  ${BOOST_LIBRARIES}  
 )
+#
 #  ${GDCM_LIBRARIES}
 #  ${SQLITE_LIBRARIES})
 

diff --git a/src/creaSystem.h b/src/creaSystem.h
index a64dc7c642dc5ce73880c3a9fa1f70dcabf821a1..997050f7d3f6e8c678505815b4a2ea9515cfd79c 100644 (file)
--- a/src/creaSystem.h
+++ b/src/creaSystem.h
@@ -3,8 +3,8 @@
   Program:   crea
   Module:    $RCSfile: creaSystem.h,v $
   Language:  C++
-  Date:      $Date: 2009/09/15 11:32:40 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2009/09/17 11:47:46 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -98,9 +98,9 @@
 #if defined(_WIN32) && defined(CREA_BUILD_SHARED)
 //#include "WWW.h"
   #ifdef CREA_EXPORT_SYMBOLS
-    #define CREA_EXPORT __declspec( dllexport )
+    #define CREA_EXPORT __declspec( dllexport ) 
   #else
-    #define CREA_EXPORT __declspec( dllimport )
+       #define CREA_EXPORT __declspec( dllimport )
   #endif
   #define CREA_CDECL __cdecl
 #else

diff --git a/src/creaVtk.h b/src/creaVtk.h
index 7302e984afc0f059f310b45db8cd558e8ac74af9..fea59cf35742bd8bebe45d1f50009e525c031097 100644 (file)
--- a/src/creaVtk.h
+++ b/src/creaVtk.h
@@ -10,7 +10,8 @@ namespace crea
 {
 
   template <class T>
-  vtkImageData* /*CREA_EXPORT*/ NewVtkImageDataFromRaw( T* data,
+
+  CREA_EXPORT vtkImageData* NewVtkImageDataFromRaw( T* data,
                                                    int nx, 
                                                    int ny,
                                                    int nz,

diff --git a/src/creaVtk.txx b/src/creaVtk.txx
index 7fd3539d656650176bf94d83ed150fda09785754..5cc68e32dae62fcc434b8d26141084bbc10e4f1a 100644 (file)
--- a/src/creaVtk.txx
+++ b/src/creaVtk.txx
@@ -19,7 +19,7 @@ namespace crea
 {
   
   template <class T>
-  vtkImageData* /*CREA_EXPORT*/ NewVtkImageDataFromRaw( T* data,
+  CREA_EXPORT vtkImageData* NewVtkImageDataFromRaw( T* data, 
                                                    int nx, 
                                                    int ny,
                                                    int nz,