From be10500e407f4987c0b0012b652060d57a3b91e6 Mon Sep 17 00:00:00 2001 From: Thomas Lieb Date: Fri, 26 May 2023 15:48:43 +0200 Subject: [PATCH] update pull-request --- CMakeLists.txt | 11 +++-------- Config.cmake.in | 5 +++++ 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 Config.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d3dfee..293a949 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,10 +14,10 @@ # limitations under the License. # # ------------------------------------------------------------------------ # -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.1) project(SPTK - VERSION 4.1.0 + VERSION 4.1 ) if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") @@ -230,12 +230,8 @@ install(EXPORT ${PROJECT_NAME}Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ) -file(WRITE ${PROJECT_BINARY_DIR}/Config.cmake.in - "@PACKAGE_INIT@\n\ninclude(\"\${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake\")\n\ncheck_required_components(@PROJECT_NAME@)\n" - ) - configure_package_config_file( - ${PROJECT_BINARY_DIR}/Config.cmake.in + ${PROJECT_SOURCE_DIR}/Config.cmake.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ) @@ -244,7 +240,6 @@ write_basic_package_version_file( ${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake VERSION ${PROJECT_VERSION} COMPATIBILITY SameMajorVersion - ARCH_INDEPENDENT ) install(FILES diff --git a/Config.cmake.in b/Config.cmake.in new file mode 100644 index 0000000..8c9ad12 --- /dev/null +++ b/Config.cmake.in @@ -0,0 +1,5 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") + +check_required_components(@PROJECT_NAME@)