Merge branch 'root6' of ssh://git.psi.ch/nemu/musrfit into root6

This commit is contained in:
suter_a 2022-12-21 15:09:25 +01:00
commit a3276dd352
2 changed files with 44 additions and 38 deletions

View File

@ -96,9 +96,13 @@ if (OpenMP_FOUND)
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))
if (OpenMP_FOUND)
if (OpenMP_CXX_LIBRARIES)
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)
target_link_libraries(FitPofB
${gomp}
FFTW3::FFTW3 FFTW3::FFTW3F ${ROOT_LIBRARIES}
@ -141,4 +145,3 @@ install(
DESTINATION lib/pkgconfig
)
#]==]

View File

@ -58,9 +58,13 @@ if (OpenMP_FOUND)
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))
if (OpenMP_FOUND)
if (OpenMP_CXX_LIBRARIES)
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)
target_link_libraries(LFRelaxation
${gomp}
${GSL_LIBRARIES} FFTW3::FFTW3F
@ -92,4 +96,3 @@ install(
DESTINATION lib/pkgconfig
)
#]==]