no message

[crea.git] / cmake / CREAMacro_FindAndUseLibraries.cmake

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index bd7cfb49d8e701a896a0534a238706cb3d6a8c1d..d5d4aca330aa031b1eb1f1cee0c4e583b0935d9d 100644 (file)
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -20,14 +20,18 @@ 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)
+       #FIND_PACKAGE(Qt4 REQUIRED)     
+       
     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 +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)
+    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)
@@ -269,36 +274,43 @@ IF(USE_BOOST)
           
       CREA_DEFINE( USE_BOOST )
          IF(WIN32)
-               LINK_DIRECTORIES( ${Boost_INCLUDE_DIRS}/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
-                   libboost_signals-vc71-mt-1_37
-                   libboost_filesystem-vc71-mt-1_37
-                   boost_date_time-vc71-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
            )
          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)