Merge pull request #54 from veprbl/pr/CMAKE_INSTALL_FULL_

CMakeLists.txt: use CMAKE_INSTALL_FULL_* to support absolute paths in CMAKE_INSTALL_*
scarrazza · Dec 11, 2023 · 575fb2d · 575fb2d
2 parents 72bf6ec + 5018457
commit 575fb2d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,10 +44,9 @@ message(STATUS "APFEL: APFEL_ENABLE_LHAPDF=${APFEL_ENABLE_LHAPDF}")
 message(STATUS "APFEL: APFEL_DOWNLOAD_PDFS=${APFEL_DOWNLOAD_PDFS}")
 
 # CONFIG SCRIPT ========================================================
-set(prefix ${CMAKE_INSTALL_PREFIX})
-set(exec_prefix "${prefix}")
-set(includedir "${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
-set(libdir "${prefix}/${CMAKE_INSTALL_LIBDIR}")
+set(prefix "${CMAKE_INSTALL_PREFIX}")
+set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
 set(PACKAGE_VERSION "${apfel_VERSION}")
 configure_file("${PROJECT_SOURCE_DIR}/bin/apfel-config.in" "${PROJECT_BINARY_DIR}/bin/apfel-config")
 configure_file("${PROJECT_SOURCE_DIR}/bin/apfel.in" "${PROJECT_BINARY_DIR}/bin/apfel")

diff --git a/bin/apfel-config.in b/bin/apfel-config.in
@@ -2,7 +2,6 @@
 
 # These variables need to exist
 prefix=@prefix@
-exec_prefix=@exec_prefix@
 
 if [[ $# -eq 0 || -n $( echo $* | egrep -- "--help|-h" ) ]]; then
     echo