diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f8d97dd..ef636090 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -502,29 +502,32 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}") message(STATUS "Initial CMAKE_INSTALL_LIBDIR: ${CMAKE_INSTALL_LIBDIR}") -set(PSB_CMAKE_INSTALL_PREFIX CMAKE_INSTALL_PREFIX) +set(PSB_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) if(NOT PSB_CMAKE_INSTALL_LIBDIR) message(STATUS "CMAKE_INSTALL_LIBDIR is set to default value lib") set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory" FORCE) + set(PSB_CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR}) else() - set(CMAKE_INSTALL_LIBDIR PSB_CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR ${PSB_CMAKE_INSTALL_LIBDIR}) message(STATUS "CMAKE_INSTALL_LIBDIR is set to: ${CMAKE_INSTALL_LIBDIR}") endif() if(NOT PSB_CMAKE_INSTALL_INCLUDEDIR) message(STATUS "CMAKE_INSTALL_INCLUDEDIR is set to default value lib") set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE STRING "Include directory" FORCE) + set(PSB_CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}) else() - set(CMAKE_INSTALL_INCLUDEDIR PSB_CMAKE_INSTALL_INCLUDEDIR) + set(CMAKE_INSTALL_INCLUDEDIR ${PSB_CMAKE_INSTALL_INCLUDEDIR}) message(STATUS "CMAKE_INSTALL_INCLUDEDIR is set to: ${CMAKE_INSTALL_INCLUDEDIR}") endif() if(NOT PSB_CMAKE_INSTALL_MODULDIR) message(STATUS "CMAKE_INSTALL_MODULDIR is set to default value lib") set(CMAKE_INSTALL_MODULDIR "modules" CACHE STRING "Modules directory" FORCE) + set(PSB_CMAKE_INSTALL_MODULDIR ${CMAKE_INSTALL_MODULDIR}) else() - set(CMAKE_INSTALL_MODULDIR PSB_CMAKE_INSTALL_MODULDIR) + set(CMAKE_INSTALL_MODULDIR ${PSB_CMAKE_INSTALL_MODULDIR}) message(STATUS "CMAKE_INSTALL_MODULDIR is set to: ${CMAKE_INSTALL_MODULDIR}") endif() @@ -1093,10 +1096,10 @@ export( -message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX};") -message(STATUS "CMAKE_INSTALL_LIBDIR: ${CMAKE_INSTALL_LIBDIR};") -message(STATUS "CMAKE_INSTALL_INCLUDEDIR: ${CMAKE_INSTALL_INCLUDEDIR};") -message(STATUS "CMAKE_INSTALL_MODULDIR: ${CMAKE_INSTALL_MODULDIR};") +message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX} - ${PSB_CMAKE_INSTALL_PREFIX};") +message(STATUS "CMAKE_INSTALL_LIBDIR: ${CMAKE_INSTALL_LIBDIR} - ${PSB_CMAKE_INSTALL_LIBDIR};") +message(STATUS "CMAKE_INSTALL_INCLUDEDIR: ${CMAKE_INSTALL_INCLUDEDIR} - ${PSB_CMAKE_INSTALL_INCLUDEDIR};") +message(STATUS "CMAKE_INSTALL_MODULDIR: ${CMAKE_INSTALL_MODULDIR} - ${PSB_CMAKE_INSTALL_MODULDIR};") diff --git a/cmake/psblasConfig.cmake.in b/cmake/psblasConfig.cmake.in index a050e9b3..ce147dd1 100644 --- a/cmake/psblasConfig.cmake.in +++ b/cmake/psblasConfig.cmake.in @@ -7,5 +7,12 @@ set(psblas_INCLUDE_DIRS "@CMAKE_INSTALL_INCLUDEDIR@") include(CMakeFindDependencyMacro) + +set(PSB_CMAKE_INSTALL_PREFIX "@PSB_CMAKE_INSTALL_PREFIX@") +set(PSB_CMAKE_INSTALL_LIBDIR "@PSB_CMAKE_INSTALL_LIBDIR@") +set(PSB_CMAKE_INSTALL_INCLUDEDIR "@PSB_CMAKE_INSTALL_INCLUDEDIR@") +set(PSB_CMAKE_INSTALL_MODULDIR "@PSB_CMAKE_INSTALL_MODULDIR@") + + # Provide the targets include("${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@Targets.cmake")