From 328eb8f5d7c90d19576eb2adf27f381cc0e2400a Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 3 Aug 2022 13:11:18 +0200 Subject: [PATCH] #3492 OpenMP MacOs --- CMakeLists.txt | 54 +-------------------------------- bbtk_creaVtk_PKG/CMakeLists.txt | 3 +- 2 files changed, 3 insertions(+), 54 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b5c5f9..cbc290e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,59 +77,6 @@ ENDIF(crea_FOUND) #================================== -#FIND_PACKAGE(OpenMP) -#IF(OPENMP_FOUND) -# SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") -# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") -# message(EED oooopppppeeeeennnnmmmmmppppp ${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} ) -#ENDIF() -#message(EED oooopppppeeeeennnnmmmmmppppp ${OpenMP_FOUND} ) - - -### Find OpenMP -if(APPLE ) - if(CMAKE_C_COMPILER_ID MATCHES "Clang") - set(OpenMP_C "${CMAKE_C_COMPILER}") - set(OpenMP_C_FLAGS "-Xclang -fopenmp=libomp -Wno-unused-command-line-argument") - set(OpenMP_C_LIB_NAMES "libomp" "libgomp" "libiomp5") - set(OpenMP_libomp_LIBRARY ${OpenMP_C_LIB_NAMES}) - set(OpenMP_libgomp_LIBRARY ${OpenMP_C_LIB_NAMES}) - set(OpenMP_libiomp5_LIBRARY ${OpenMP_C_LIB_NAMES}) - endif() - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(OpenMP_CXX "${CMAKE_CXX_COMPILER}") -# set(OpenMP_CXX_FLAGS "-fopenmp=libomp -Wno-unused-command-line-argument") - set(OpenMP_CXX_FLAGS "-Xclang -fopenmp -Wno-unused-command-line-argument") - set(OpenMP_CXX_LIB_NAMES "libomp" "libgomp" "libiomp5") - set(OpenMP_libomp_LIBRARY ${OpenMP_CXX_LIB_NAMES}) - -#EED 2022/05/15 - set(OpenMP_libomp_LIBRARY_crea libomp.dylib ) - - set(OpenMP_libgomp_LIBRARY ${OpenMP_CXX_LIB_NAMES}) - set(OpenMP_libiomp5_LIBRARY ${OpenMP_CXX_LIB_NAMES}) - endif() -endif() - find_package(OpenMP REQUIRED) -if (OPENMP_FOUND) -# include_directories("${OPENMP_INCLUDES}") - link_directories("${OPENMP_LIBRARIES}") - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") - # set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}") -endif(OPENMP_FOUND) - -message(EED oooopppppeeeeennnnmmmmmppppp2222A ${OPENMP_FOUND} ) -message(EED oooopppppeeeeennnnmmmmmppppp2222B ${OPENMP_INCLUDES} ) -message(EED oooopppppeeeeennnnmmmmmppppp2222C ${OpenMP_libomp_LIBRARY} ) -message(EED oooopppppeeeeennnnmmmmmppppp2222D ${OpenMP_CXX_FLAGS} ) -message(EED oooopppppeeeeennnnmmmmmppppp2222E ${OpenMP_CXX_LIBRARIES} ) - - - - - - # USER! : Add here as many 'FIND_PACKAGE' blocks as *your* aplication requires # ----- @@ -163,6 +110,7 @@ SET(USE_KWWIDGETS OFF) SET(USE_VTK ON) SET(USE_ITK OFF) SET(USE_BOOST OFF) +SET(USE_OPENMP ON) #================================== diff --git a/bbtk_creaVtk_PKG/CMakeLists.txt b/bbtk_creaVtk_PKG/CMakeLists.txt index afced27..202965a 100644 --- a/bbtk_creaVtk_PKG/CMakeLists.txt +++ b/bbtk_creaVtk_PKG/CMakeLists.txt @@ -145,9 +145,10 @@ SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS #=========================================================================== SET(${BBTK_PACKAGE_NAME}_LIBS -creaVtk + creaVtk ${OpenMP_libomp_LIBRARY_crea} ${VTK_LIBRARIES} + # LIST HERE THE ADDITIONAL LIBS TO LINK AGAINST # EXCEPT : the same libs than for INCLUDE_DIRS ) -- 2.47.1