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

DKS improvements on macOS Big Sur.

Browse Source
This commit is contained in:
suter_a 2020-12-16 20:14:28 +01:00
parent aaa551be2b
commit 0bdcaf3497
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -132,10 +132,18 @@ if (dks)
if (NOT CUDA_FOUND AND NOT OpenCL_FOUND) if (NOT CUDA_FOUND AND NOT OpenCL_FOUND)
message(WARNING ">> Neither CUDA nor OpenCL found which are required for DKS, hence disable DKS support <<") message(WARNING ">> Neither CUDA nor OpenCL found which are required for DKS, hence disable DKS support <<")
else (NOT CUDA_FOUND AND NOT OpenCL_FOUND) else (NOT CUDA_FOUND AND NOT OpenCL_FOUND)
find_package(DKS) find_package(DKS "1.1.4"
endif (NOT CUDA_FOUND AND NOT OpenCL_FOUND) HINTS "/usr/local/lib/"
)
endif (NOT CUDA_FOUND AND NOT OpenCL_FOUND)
endif (dks) endif (dks)
if (DKS_FOUND)
message(STATUS "DKS version : ${DKS_VERSION}")
message(STATUS "DKS include dir : ${DKS_INCLUDE_DIR}")
message(STATUS "DKS library : ${DKS_LIBRARY}")
endif (DKS_FOUND)
#--- check for Qt ------------------------------------------------------------- #--- check for Qt -------------------------------------------------------------
if (qt_based_tools) if (qt_based_tools)
# check for any Qt, i.e. AUTO # check for any Qt, i.e. AUTO

4
src/classes/CMakeLists.txt
View File

@ -163,7 +163,9 @@ if (OpenMP_FOUND)
endif (OpenMP_CXX_LIBRARIES) endif (OpenMP_CXX_LIBRARIES)
endif (OpenMP_FOUND) endif (OpenMP_FOUND)
if (DKS_FOUND) if (DKS_FOUND)
set(DependOnLibs ${DependOnLibs} ${DKS_LIBS}) set(DependOnLibs ${DependOnLibs} "-framework OpenCL")
set(DependOnLibs ${DependOnLibs} "-L ${DKS_LIBRARY_DIR}")
set(DependOnLibs ${DependOnLibs} ${DKS_LIBRARY})
endif (DKS_FOUND) endif (DKS_FOUND)
target_link_libraries(PUserFcnBase ${ROOT_LIBRARIES}) target_link_libraries(PUserFcnBase ${ROOT_LIBRARIES})