*** empty log message ***

[crea.git] / cmake / CREAMacro_FindAndUseLibraries.cmake

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index e3888b145d484bfc41b59c585d90bd1fcf4d8f61..bca8c45aac729af259d61034ee2b7b62baee85cb 100644 (file)
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -1,11 +1,12 @@
 
 
 MACRO(CREA_FIND_AND_USE_LIBRARIES)
-#MESSAGE(ERROR "EED CREAMacrp_FindAndUseLibraries")
+
 IF(INCLUDE_CTEST)
-       include(CTEST)
+       include(CTest) 
 ENDIF(INCLUDE_CTEST)
 
+
 set(USE_DEBUG_LIB "" CACHE BOOL "Use Debug Libraries" )
 
 #-----------------------------------------------------------------------------
@@ -156,9 +157,11 @@ IF(USE_GDCM)
             )
        ENDIF(USE_VTK)
       ENDIF(USE_GDCM_VTK)
+
     ELSE(GDCM_FOUND)     
          MESSAGE(FATAL_ERROR "GDCM not found....")
     ENDIF(GDCM_FOUND)
+
   ENDIF(NOT GDCM_FOUND)
 ENDIF(USE_GDCM)
 
@@ -192,14 +195,22 @@ IF(USE_GDCM2)
 
       IF(USE_GDCM_VTK)
        IF(USE_VTK)
-         SET(GDCM_LIBRARIES
-           ${GDCM_LIBRARIES}
-               vtkgdcm2
-               gdcm2vtk
-            )
+               IF(WIN32)
+                 SET(GDCM_LIBRARIES
+                   ${GDCM_LIBRARIES}
+                       vtkgdcm
+                       gdcm2vtk
+                    )
+               ELSE(WIN32)
+                   SET(GDCM_LIBRARIES
+                   ${GDCM_LIBRARIES}
+                       vtkgdcm
+                       )
+               ENDIF(WIN32)
+               
        ENDIF(USE_VTK)
       ENDIF(USE_GDCM_VTK)
-      
+     
 
 ENDIF(USE_GDCM2)
 
@@ -265,38 +276,46 @@ IF(USE_TTH)
   ENDIF(NOT TTH_EXECUTABLE)
 ENDIF(USE_TTH)
 #-----------------------------------------------------------------------------
-
 #-----------------------------------------------------------------------------
 IF(USE_BOOST)
+message(STATUS "1")
   IF(NOT Boost_FOUND)
-    FIND_PACKAGE(Boost REQUIRED)
+      FIND_PACKAGE(Boost COMPONENTS filesystem  signals date_time regex REQUIRED)
     IF(Boost_FOUND)
+       message(STATUS "1 bis")
       MESSAGE ( STATUS "=======================================")
       MESSAGE ( STATUS "Looking for boost C++ library... - found in ${Boost_INCLUDE_DIR}")
       INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})        
-      LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS} )
-
-      CREA_DEFINE( USE_BOOST )
+                       LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS}) 
          IF(WIN32)
+         message("creamacro find and use lib = ${Boost_LIBRARIES}")
+       
+
+               CREA_DEFINE( USE_BOOST )
                
-               LINK_DIRECTORIES( ${Boost_INCLUDE_DIRS}/Bin/lib) 
-               #message("creamacro find and use lib = ${Boost_SIGNALS_LIBRARY}")
-               IF(USE_DEBUG_LIB)
-                       SET(BOOST_LIBRARIES
-                               boost_signals-vc90-mt-gd-1_40
-                               boost_filesystem-vc90-mt-gd-1_40
-                               boost_date_time-vc90-mt-gd-1_40                    
-                          #what about boost_thread? JPR
-                       )
-               ELSE(NOT USE_DEBUG_LIB)
-                       SET(BOOST_LIBRARIES
-                               boost_signals-vc90-mt-1_40
-                               boost_filesystem-vc90-mt-1_40
-                               boost_date_time-vc90-mt-1_40
+               SET(BOOST_LIBRARIES
+                       ${Boost_LIBRARIES}
                        )
-               ENDIF(USE_DEBUG_LIB)
+# FCY with cmake boost, it's useless. 
+# But if it is not working, uncomment  
+#
+#      IF(USE_DEBUG_LIB)
+#                      SET(BOOST_LIBRARIES
+#                              boost_signals-vc90-mt-gd-1_40
+#                              boost_filesystem-vc90-mt-gd-1_40
+#                              boost_date_time-vc90-mt-gd-1_40                    
+#                         #what about boost_thread? JPR
+#                      )
+#              ELSE(NOT USE_DEBUG_LIB)
+#                      SET(BOOST_LIBRARIES
+#                              boost_signals-vc90-mt-1_40
+#                              boost_filesystem-vc90-mt-1_40
+#                              boost_date_time-vc90-mt-1_40
+#                      )
+#              ENDIF(USE_DEBUG_LIB)    
          ENDIF(WIN32)
       IF(NOT WIN32)
+
                  SET(BOOST_LIBRARIES
                        boost_signals-mt
                        boost_filesystem-mt
@@ -308,37 +327,46 @@ IF(USE_BOOST)
                        )
       ENDIF(NOT WIN32)
 
-      MARK_AS_ADVANCED(Boost_INCLUDE_DIR)
+         MARK_AS_ADVANCED(Boost_INCLUDE_DIR)
+         MARK_AS_ADVANCED(Boost_LIBRARY_DIRS)
+     
     ELSE(Boost_FOUND)
-      MESSAGE(FATAL_ERROR "boost C++ library not found - Set Boost_INCLUDE_DIR to the directory containing boost headers")
+       message(STATUS "2")
+      MESSAGE( "boost C++ library not found - Set Boost_INCLUDE_DIR to the directory containing boost headers")
     ENDIF(Boost_FOUND)
   ENDIF(NOT Boost_FOUND)
+  message("${Boost_FOUND}")
+ 
+
 ENDIF(USE_BOOST)
-#-----------------------------------------------------------------------------
+#-----------------------------------------------------------
 
 IF(USE_XERCES)
 
        # FIND xerces
-       IF(WIN32)       
+       IF(WIN32)
+       
                SET(XERCES_LIB_DIR $ENV{XERCES_DIR})
+       
                IF(NOT XERCES_LIB_DIR)  
                  MESSAGE(FATAL_ERROR "XERCES_DIR not found")  
                ELSE(NOT XERCES_LIB_DIR)
-##EED                    INCLUDE_DIRECTORIES( ${XERCES_LIB_DIR}/src )          
-##EED            LINK_DIRECTORIES(  ${XERCES_LIB_DIR}/Build/Win32/VC9/Debug )
-                 INCLUDE_DIRECTORIES( ${XERCES_LIB_DIR}/include )              
-                 LINK_DIRECTORIES(  ${XERCES_LIB_DIR}/lib )
+                 
+               INCLUDE_DIRECTORIES( ${XERCES_LIB_DIR}/include )                
+               LINK_DIRECTORIES(  ${XERCES_LIB_DIR}/lib )
+                 
                ENDIF(NOT XERCES_LIB_DIR)       
+               
                IF(USE_DEBUG_LIB)
-##EED            set(XERCES_LIBRARIES  ${XERCES_LIB_DIR}/Build/Win32/VC9/Debug/xerces-c_3D)
-                 set(XERCES_LIBRARIES  xerces-c_3D)
+                       set(XERCES_LIBRARIES  xerces-c_3D)
                ELSE(USE_DEBUG_LIB)
-#EED             set(XERCES_LIBRARIES  ${XERCES_LIB_DIR}/Build/Win32/VC9/Release/xerces-c_3)
-                 set(XERCES_LIBRARIES  xerces-c_3)
+                       set(XERCES_LIBRARIES  xerces-c_3)
                ENDIF(USE_DEBUG_LIB)
+               
                MARK_AS_ADVANCED(XERCES_LIB_DIR)
        ENDIF(WIN32)
 
+
        IF(UNIX)
                IF(APPLE)
                        SET(XERCES_LIBRARIES xerces-c )
@@ -347,7 +375,7 @@ IF(USE_XERCES)
                ELSEIF(APPLE)
                        SET(XERCES_LIBRARIES libxerces-c.so )
                         INCLUDE_DIRECTORIES( /usr/local/include )
-                        LINK_DIRECTORIES(  /usr/local/lib ) 
+                        LINK_DIRECTORIES(  /usr/local/lib /usr/lib) 
                        #FIND_PACKAGE(Xerces)
                        # Use if found
                        #IF(Xerces_FOUND)