Merge branch 'root6' of ssh://git.psi.ch/nemu/musrfit into root6
This commit is contained in:
commit
a3276dd352
11
src/external/libFitPofB/classes/CMakeLists.txt
vendored
11
src/external/libFitPofB/classes/CMakeLists.txt
vendored
@ -96,9 +96,13 @@ if (OpenMP_FOUND)
|
|||||||
endif (OpenMP_FOUND)
|
endif (OpenMP_FOUND)
|
||||||
|
|
||||||
set(gomp "")
|
set(gomp "")
|
||||||
if (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux))
|
if (OpenMP_FOUND)
|
||||||
set(gomp gomp)
|
if (OpenMP_CXX_LIBRARIES)
|
||||||
endif (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux))
|
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
|
target_link_libraries(FitPofB
|
||||||
${gomp}
|
${gomp}
|
||||||
FFTW3::FFTW3 FFTW3::FFTW3F ${ROOT_LIBRARIES}
|
FFTW3::FFTW3 FFTW3::FFTW3F ${ROOT_LIBRARIES}
|
||||||
@ -141,4 +145,3 @@ install(
|
|||||||
DESTINATION lib/pkgconfig
|
DESTINATION lib/pkgconfig
|
||||||
)
|
)
|
||||||
#]==]
|
#]==]
|
||||||
|
|
||||||
|
11
src/external/libLFRelaxation/CMakeLists.txt
vendored
11
src/external/libLFRelaxation/CMakeLists.txt
vendored
@ -58,9 +58,13 @@ if (OpenMP_FOUND)
|
|||||||
endif (OpenMP_FOUND)
|
endif (OpenMP_FOUND)
|
||||||
|
|
||||||
set(gomp "")
|
set(gomp "")
|
||||||
if (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux))
|
if (OpenMP_FOUND)
|
||||||
set(gomp gomp)
|
if (OpenMP_CXX_LIBRARIES)
|
||||||
endif (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux))
|
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
|
target_link_libraries(LFRelaxation
|
||||||
${gomp}
|
${gomp}
|
||||||
${GSL_LIBRARIES} FFTW3::FFTW3F
|
${GSL_LIBRARIES} FFTW3::FFTW3F
|
||||||
@ -92,4 +96,3 @@ install(
|
|||||||
DESTINATION lib/pkgconfig
|
DESTINATION lib/pkgconfig
|
||||||
)
|
)
|
||||||
#]==]
|
#]==]
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user