From df78aa45453c52f619f1f5c7d1fa0f4245420a3f Mon Sep 17 00:00:00 2001 From: Eduardo Enrique Davila Serrano Date: Mon, 3 Oct 2022 12:25:08 +0200 Subject: [PATCH] #3392 vtk9itk5wx3-macos --- cmake/CREAMacro_FindAndUseLibraries.cmake | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake index 09d3d77..59fcb7a 100644 --- 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}") @@ -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) -- 2.47.1