Merge branch 'vtk9itk5wx3-macos' of ssh://git.creatis.insa-lyon.fr/crea into vtk9itk5...

[crea.git] / cmake / CREAMacro_FindAndUseLibraries.cmake

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index 96cf5ec8b7081169325f54957058ee76959369bd..59fcb7a776bd963c0107c9b31d4773ca492b0dfb 100644 (file)
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -24,29 +24,23 @@ IF(USE_CREA)
 ENDIF(USE_CREA)
 #-----------------------------------------------------------------------------
 
-
 #-----------------------------------------------------------------------------
 
 IF(USE_QT4)
   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 )
-
    ENDIF(QT_FOUND)
   ENDIF(NOT QT_FOUND)
 ENDIF(USE_QT4)
 
-
 #JFGA Pruebas WT
 #MESSAGE (  "======================================= SET CMAKE USE_WT JFGA CREAMacro_FindAndUseLibraries.cmake")   
 #SET(USE_WT OFF)
@@ -97,14 +91,6 @@ endif()
 if (OPENMP_FOUND)
 #    include_directories("${OPENMP_INCLUDES}")
 
-message(EEE oooopppeeennnn OPENMP_LIBRARIES ${OPENMP_LIBRARIES} )
-message(EEE oooopppeeennnn OPENMP_LIBRARIES ${OPENMP_LIBRARIES} )
-message(EEE oooopppeeennnn OPENMP_LIBRARIES ${OPENMP_LIBRARIES} )
-message(EEE oooopppeeennnn OPENMP_LIBRARIES ${OPENMP_LIBRARIES} )
-message(EEE oooopppeeennnn OPENMP_LIBRARIES ${OPENMP_LIBRARIES} )
-message(EEE oooopppeeennnn OPENMP_LIBRARIES ${OPENMP_LIBRARIES} )
-message(EEE oooopppeeennnn OPENMP_LIBRARIES ${OPENMP_LIBRARIES} )
-
     link_directories( /opt/local/lib/libomp  ) 
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
@@ -388,7 +374,7 @@ IF(USE_BOOST)
                        FIND_PACKAGE(Boost COMPONENTS filesystem-mgw71 system-mgw71 signals-mgw71 date_time-mgw71 thread-mgw71 regex-mgw71 program_options-mgw71 REQUIRED)
                ELSE(APPLE)
                        set( Boost_INCLUDE_DIR $ENV{BOOST_ROOT}/include/boost-1_69)
-                       FIND_PACKAGE(Boost COMPONENTS filesystem-mgw73-mt-x64-1_69  system-mgw73-mt-x64-1_69  date_time-mgw73-mt-x64-1_69 thread-mgw73-mt-x64-1_69 regex-mgw73-mt-x64-1_69 program_options-mgw73-mt-x64-1_69  REQUIRED)
+                       FIND_PACKAGE(Boost COMPONENTS filesystem-mgw85-mt-x64-1_69  system-mgw85-mt-x64-1_69  date_time-mgw85-mt-x64-1_69 thread-mgw85-mt-x64-1_69 regex-mgw85-mt-x64-1_69 program_options-mgw85-mt-x64-1_69  REQUIRED)
                ENDIF(APPLE)
        ELSE (MINGW)
 #              FIND_PACKAGE(Boost COMPONENTS filesystem system signals date_time thread regex program_options REQUIRED)
@@ -520,5 +506,10 @@ IF(USE_XERCES)
   
 ENDIF(USE_XERCES)
 
+IF(WIN32)
+    # dlfcn.h
+       INCLUDE_DIRECTORIES(  $ENV{CREATIS_THIRDPARTYDLLS_DIRS}/../include )
+ENDIF(WIN32)
+
 
 ENDMACRO(CREA_FIND_AND_USE_LIBRARIES)