LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

modernize the way how to check/deal with OpenMP. This helps also on the macOS side.

Browse Source
This commit is contained in:
suter_a 2024-06-07 12:44:59 +02:00
parent 418adfde67
commit ccaba41868
4 changed files with 7 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -109,13 +109,13 @@ find_package(FFTW3 REQUIRED)
find_package(LibXml2 REQUIRED) find_package(LibXml2 REQUIRED)
#--- check for OpenMP --------------------------------------------------------- #--- check for OpenMP ---------------------------------------------------------
if (try_OpenMP AND NOT APPLE) if (try_OpenMP)
find_package(OpenMP) find_package(OpenMP)
if (OpenMP_FOUND) if (OpenMP_CXX_FOUND)
add_definitions(-DHAVE_GOMP) add_definitions(-DHAVE_GOMP)
set(HAVE_GOMP 1 CACHE INTERNAL "Have GOMP") set(HAVE_GOMP 1 CACHE INTERNAL "Have GOMP")
endif (OpenMP_FOUND) endif (OpenMP_CXX_FOUND)
endif (try_OpenMP AND NOT APPLE) endif (try_OpenMP)
#--- check for Qt ------------------------------------------------------------- #--- check for Qt -------------------------------------------------------------
if (qt_based_tools) if (qt_based_tools)

11
src/classes/CMakeLists.txt
View File

@ -170,11 +170,6 @@ if (ROOT_GRTEQ_24)
target_compile_options(PMusr BEFORE PRIVATE "-DROOT_GRTEQ_24") target_compile_options(PMusr BEFORE PRIVATE "-DROOT_GRTEQ_24")
endif(ROOT_GRTEQ_24) endif(ROOT_GRTEQ_24)
#--- add OpenMP compile options if needed -------------------------------------
if (OpenMP_FOUND)
target_compile_options(PMusr PUBLIC ${OpenMP_CXX_FLAGS})
endif (OpenMP_FOUND)
#--- add library dependencies ------------------------------------------------- #--- add library dependencies -------------------------------------------------
set(DependOnLibs ${ROOT_LIBARIES}) set(DependOnLibs ${ROOT_LIBARIES})
#set(DependOnLibs ${DependOnLibs} ${FFTW3_LIBRARY}) #set(DependOnLibs ${DependOnLibs} ${FFTW3_LIBRARY})
@ -189,11 +184,7 @@ if (nexus)
set(DependOnLibs ${DependOnLibs} PNeXus) set(DependOnLibs ${DependOnLibs} PNeXus)
endif (nexus) endif (nexus)
if (OpenMP_FOUND) if (OpenMP_FOUND)
if (OpenMP_CXX_LIBRARIES) set(DependOnLibs ${DependOnLibs} OpenMP::OpenMP_CXX)
set(DependOnLibs ${DependOnLibs} ${OpenMP_CXX_LIBRARIES})
else (OpenMP_CXX_LIBRARIES)
set(DependOnLibs ${DependOnLibs} ${OpenMP_CXX_FLAGS}) # for older cmake OpenMP_CXX_LIBRARIES is not defined
endif (OpenMP_CXX_LIBRARIES)
endif (OpenMP_FOUND) endif (OpenMP_FOUND)
target_link_libraries(PUserFcnBase ${ROOT_LIBRARIES}) target_link_libraries(PUserFcnBase ${ROOT_LIBRARIES})

10
src/external/libFitPofB/classes/CMakeLists.txt vendored
View File

@ -91,17 +91,9 @@ target_include_directories(
) )
#--- add library dependencies ------------------------------------------------- #--- add library dependencies -------------------------------------------------
if (OpenMP_FOUND)
target_compile_options(FitPofB PUBLIC ${OpenMP_CXX_FLAGS})
endif (OpenMP_FOUND)
set(gomp "") set(gomp "")
if (OpenMP_FOUND) if (OpenMP_FOUND)
if (OpenMP_CXX_LIBRARIES) set(gomp OpenMP::OpenMP_CXX)
set(gomp ${OpenMP_CXX_LIBRARIES})
else (OpenMP_CXX_LIBRARIES)
set(gomp ${OpenMP_CXX_FLAGS}) # for older cmake OpenMP_CXX_LIBRARIES is not defined
endif (OpenMP_CXX_LIBRARIES)
endif (OpenMP_FOUND) endif (OpenMP_FOUND)
target_link_libraries(FitPofB target_link_libraries(FitPofB
${gomp} ${gomp}

10
src/external/libLFRelaxation/CMakeLists.txt vendored
View File

@ -53,17 +53,9 @@ target_include_directories(
) )
#--- add library dependencies ------------------------------------------------- #--- add library dependencies -------------------------------------------------
if (OpenMP_FOUND)
target_compile_options(LFRelaxation PUBLIC ${OpenMP_CXX_FLAGS})
endif (OpenMP_FOUND)
set(gomp "") set(gomp "")
if (OpenMP_FOUND) if (OpenMP_FOUND)
if (OpenMP_CXX_LIBRARIES) set(gomp OpenMP::OpenMP_CXX)
set(gomp ${OpenMP_CXX_LIBRARIES})
else (OpenMP_CXX_LIBRARIES)
set(gomp ${OpenMP_CXX_FLAGS}) # for older cmake OpenMP_CXX_LIBRARIES is not defined
endif (OpenMP_CXX_LIBRARIES)
endif (OpenMP_FOUND) endif (OpenMP_FOUND)
target_link_libraries(LFRelaxation target_link_libraries(LFRelaxation
${gomp} ${gomp}