]> Creatis software - crea.git/blobdiff - cmake/CREAMacro_FindAndUseLibraries.cmake
no message
[crea.git] / cmake / CREAMacro_FindAndUseLibraries.cmake
index 21947e3d683e4a7b32f5543fd61a74168374fb69..d5d4aca330aa031b1eb1f1cee0c4e583b0935d9d 100644 (file)
@@ -23,6 +23,7 @@ IF(USE_QT4)
   IF(NOT QT_FOUND)     
   
        INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseQt.cmake)
+       #FIND_PACKAGE(Qt4 REQUIRED)     
        
     IF(QT_FOUND)
       MESSAGE ( STATUS "=======================================")
@@ -248,7 +249,8 @@ 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 $ENV{CREATIS}/tth/) 
+    FIND_FILE( TTH_EXECUTABLE NAME tth tth.exe PATHS . $ENV{CREATIS}/tth_exe/ ~/Creatis/tth ~/Creatis/tth_linux $ENV{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)
@@ -272,15 +274,19 @@ IF(USE_BOOST)
           
       CREA_DEFINE( USE_BOOST )
          IF(WIN32)
-               LINK_DIRECTORIES( ${Boost_INCLUDE_DIRS}/stage/lib)
+               
+               LINK_DIRECTORIES( ${Boost_INCLUDE_DIRS}/stage/lib) #JCP 01/10/2009
+               #LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS})
                #MESSAGE ("EED " ${Boost_LIBRARY_DIRS})
                #libboost_signals-vc71-mt-1_37
                #libboost_filesystem-vc71-mt-1_37
                #boost_date_time-vc71-mt-1_37
+       
+               #message("creamacro find and use lib = ${Boost_SIGNALS_LIBRARY}")
                SET(BOOST_LIBRARIES
-                               boost_signals-vc90-mt-1_37                
-                boost_filesystem-vc90-mt-1_37
-                boost_date_time-vc90-mt-1_37
+                               boost_signals-vc90-mt-1_40
+                boost_filesystem-vc90-mt-1_40
+                boost_date_time-vc90-mt-1_40
                   
                   #what about boost_thread? JPR
            )