From da4f08f231642c27535d8aeefe3aef56017dea5f Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Sat, 9 Jun 2018 21:13:58 +0200 Subject: [PATCH] cmake: add the forgotten OpenMP flags and libs. --- src/external/libFitPofB/classes/CMakeLists.txt | 12 +++++++++++- src/external/libLFRelaxation/CMakeLists.txt | 12 +++++++++++- src/external/libZFRelaxation/CMakeLists.txt | 10 +++++++++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/external/libFitPofB/classes/CMakeLists.txt b/src/external/libFitPofB/classes/CMakeLists.txt index 54760667..61443e2a 100644 --- a/src/external/libFitPofB/classes/CMakeLists.txt +++ b/src/external/libFitPofB/classes/CMakeLists.txt @@ -80,9 +80,19 @@ target_include_directories( ) #--- add library dependencies ------------------------------------------------- +if (OpenMP_FOUND) + target_compile_options(FitPofB PUBLIC ${OpenMP_CXX_FLAGS}) +endif (OpenMP_FOUND) + +set(gomp "") +if (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux)) + set(gomp gomp) +endif (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux)) target_link_libraries(FitPofB + ${gomp} ${FFTW3_LIBRARY} ${FFTW3F_LIBRARY} ${ROOT_LIBRARIES} - TLemRunHeader PUserFcnBase BMWtools) + TLemRunHeader PUserFcnBase BMWtools +) #--- install FitPofB solib ---------------------------------------------------- install(TARGETS FitPofB DESTINATION lib) diff --git a/src/external/libLFRelaxation/CMakeLists.txt b/src/external/libLFRelaxation/CMakeLists.txt index af9274f3..2d7bf19f 100644 --- a/src/external/libLFRelaxation/CMakeLists.txt +++ b/src/external/libLFRelaxation/CMakeLists.txt @@ -46,7 +46,17 @@ target_include_directories( ) #--- add library dependencies ------------------------------------------------- -target_link_libraries(LFRelaxation ${GSL_LIBRARIES} ${FFTW3F_LIBRARY} +if (OpenMP_FOUND) + target_compile_options(LFRelaxation PUBLIC ${OpenMP_CXX_FLAGS}) +endif (OpenMP_FOUND) + +set(gomp "") +if (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux)) + set(gomp gomp) +endif (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux)) +target_link_libraries(LFRelaxation + ${gomp} + ${GSL_LIBRARIES} ${FFTW3F_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase cuba BMWtools ) diff --git a/src/external/libZFRelaxation/CMakeLists.txt b/src/external/libZFRelaxation/CMakeLists.txt index 6c5fba1f..8dfbcbcd 100644 --- a/src/external/libZFRelaxation/CMakeLists.txt +++ b/src/external/libZFRelaxation/CMakeLists.txt @@ -46,8 +46,16 @@ target_include_directories( ) #--- add library dependencies ------------------------------------------------- +if (OpenMP_FOUND) + target_compile_options(ZFRelaxation PUBLIC ${OpenMP_CXX_FLAGS}) +endif (OpenMP_FOUND) + +set(gomp "") +if (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux)) + set(gomp gomp) +endif (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux)) target_link_libraries(ZFRelaxation - ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase cuba BMWtools + ${gomp} ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase cuba BMWtools ) #--- install ZFRelaxation solib -----------------------------------------------