95fec7adfc
* cp2k/sirius: add CUDA support * cp2k: fix building with MKL * sirius: make sure to link against Spacks blas/lapack/scalapack
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
From 4b51d07369b5972f3917cc8f2425caa814ae0975 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tiziano.mueller@chem.uzh.ch>
|
|
Date: Thu, 16 May 2019 10:53:04 +0200
|
|
Subject: [PATCH] cmake: fix shared library installation
|
|
|
|
fixes the error during `make install`:
|
|
|
|
TARGETS given no LIBRARY DESTINATION for shared library target
|
|
|
|
when building shared libraries.
|
|
|
|
... and respect the current OS/distro library dir.
|
|
---
|
|
src/CMakeLists.txt | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 65307dd3..2b7a5279 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -2,6 +2,8 @@
|
|
# working correctly
|
|
# list(APPEND CUDA_NVCC_FLAGS "-Xcompiler -fPIC")
|
|
|
|
+include(GNUInstallDirs) # required to get a proper LIBDIR variable
|
|
+
|
|
# keep two libraries: libsirius and libsirius_f
|
|
|
|
if(USE_CUDA)
|
|
@@ -9,13 +11,18 @@ if(USE_CUDA)
|
|
file(GLOB_RECURSE CUFILES_KERNELS "Kernels/*.cu")
|
|
add_library(sirius_cu "${CUFILES_KERNELS};${CUFILES_SDDK}")
|
|
set_target_properties(sirius_cu PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
|
- INSTALL (TARGETS sirius_cu ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/)
|
|
+ INSTALL (TARGETS sirius_cu
|
|
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
|
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
|
+ )
|
|
endif()
|
|
if(CREATE_FORTRAN_BINDINGS)
|
|
add_library(sirius_f "sirius_api.cpp;sirius.f90")
|
|
SIRIUS_SETUP_TARGET(sirius_f)
|
|
INSTALL (TARGETS sirius_f ARCHIVE DESTINATION
|
|
- ${CMAKE_INSTALL_PREFIX}/lib/)
|
|
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
|
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
|
+ )
|
|
set_target_properties(sirius_f PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
|
set_target_properties(sirius_f PROPERTIES Fortran_MODULE_DIRECTORY mod_files)
|
|
target_link_libraries(sirius_f PUBLIC OpenMP::OpenMP_CXX)
|
|
--
|
|
2.16.4
|
|
|