From e5571d1b530cce1061989bdb49fd4cf4f565a6fc Mon Sep 17 00:00:00 2001 From: Izaak Beekman Date: Tue, 2 Jan 2018 12:55:13 -0500 Subject: [PATCH] Fix CMake errors --- CMakeLists.txt | 3 ++- base/CMakeLists.txt | 2 +- cmake/pkg/{PSBLASConfig.cmake.in => psblasConfig.cmake.in} | 1 - krylov/CMakeLists.txt | 2 +- prec/CMakeLists.txt | 2 +- util/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename cmake/pkg/{PSBLASConfig.cmake.in => psblasConfig.cmake.in} (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e533ae75..50300ebad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -336,7 +336,8 @@ write_basic_package_version_file( "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake" VERSION "${psblas_VERSION}" COMPATIBILITY SameMajorVersion -) + ) + configure_file("${CMAKE_SOURCE_DIR}/cmake/pkg/${CMAKE_PROJECT_NAME}Config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CMAKE_PROJECT_NAME}Config.cmake" @ONLY) diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index fb5ce5e75..cf8b8cad1 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -463,7 +463,7 @@ install(DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/" DESTINATION FILES_MATCHING PATTERN "*.mod") install(TARGETS base - EXPORT PSBLAS_Targets + EXPORT ${CMAKE_PROJECT_NAME}-targets DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ) diff --git a/cmake/pkg/PSBLASConfig.cmake.in b/cmake/pkg/psblasConfig.cmake.in similarity index 99% rename from cmake/pkg/PSBLASConfig.cmake.in rename to cmake/pkg/psblasConfig.cmake.in index 02070671a..3fe60345b 100644 --- a/cmake/pkg/PSBLASConfig.cmake.in +++ b/cmake/pkg/psblasConfig.cmake.in @@ -14,4 +14,3 @@ include ( "${@PACKAGE_NAME@_CONFIG_INSTALL_DIR}/@PACKAGE_NAME@-targets.cmake" ) # Make the module files available via include set_and_check ( @CMAKE_PROJECT_NAME@_INCLUDE_DIRS "@PACKAGE_INSTALL_MOD_DIR@" ) - diff --git a/krylov/CMakeLists.txt b/krylov/CMakeLists.txt index 7316066eb..eed33a90f 100644 --- a/krylov/CMakeLists.txt +++ b/krylov/CMakeLists.txt @@ -146,7 +146,7 @@ set_target_properties ( krylov OUTPUT_NAME psb_krylov ) -install(TARGETS krylov EXPORT PSBLAS_Targets +install(TARGETS krylov EXPORT ${CMAKE_PROJECT_NAME}-targets DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ) diff --git a/prec/CMakeLists.txt b/prec/CMakeLists.txt index a34af9c1c..b007acf52 100644 --- a/prec/CMakeLists.txt +++ b/prec/CMakeLists.txt @@ -163,7 +163,7 @@ set_target_properties ( prec OUTPUT_NAME psb_prec ) -install(TARGETS prec EXPORT PSBLAS_Targets +install(TARGETS prec EXPORT ${CMAKE_PROJECT_NAME}-targets DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ) diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt index 201b836ad..747f8dcd2 100644 --- a/util/CMakeLists.txt +++ b/util/CMakeLists.txt @@ -134,7 +134,7 @@ set_target_properties ( util OUTPUT_NAME psb_util ) -install(TARGETS util EXPORT PSBLAS_Targets +install(TARGETS util EXPORT ${CMAKE_PROJECT_NAME}-targets DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" )