From 3415d6fc032422751a1e366cfd51bbb8fe46d6a6 Mon Sep 17 00:00:00 2001 From: yizhangss Date: Fri, 16 Dec 2022 11:29:28 +0800 Subject: [PATCH] tmp update --- WaveLibConfig.cmake.in | 10 +++++----- auxiliary/CMakeLists.txt | 3 +-- src/CMakeLists.txt | 3 +-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/WaveLibConfig.cmake.in b/WaveLibConfig.cmake.in index a1e218c..3dd1b5d 100644 --- a/WaveLibConfig.cmake.in +++ b/WaveLibConfig.cmake.in @@ -1,6 +1,6 @@ -@PACKAGE_INIT@ +set(@PROJECT_NAME@_VERSION "@PROJECT_VERSION@") -set(@PROJECT_NAME@_Version "@PROJECT_VERSION@") +@PACKAGE_INIT@ set_and_check(@PROJECT_NAME@_INSTALL_PREFIX "${PACKAGE_PREFIX_DIR}") set_and_check(@PROJECT_NAME@_INC_DIR "${PACKAGE_PREFIX_DIR}/include") set_and_check(@PROJECT_NAME@_INCULDE_DIR "${PACKAGE_PREFIX_DIR}/include") @@ -9,11 +9,11 @@ set_and_check(@PROJECT_NAME@_LIBRARY_DIR "${PACKAGE_PREFIX_DIR}/lib") set(@PROJECT_NAME@_LIB wavelib) set(@PROJECT_NAME@_LIBRARY wavelib) -set(@PROJECT_NAME@_FOUND 1) set(WauxLib_LIB wauxlib) set(WauxLib_LIBRARY wauxlib) -set(WauxLib_FOUND 1) # include target information -include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") \ No newline at end of file +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") + +check_required_components(@PROJECT_NAME@) \ No newline at end of file diff --git a/auxiliary/CMakeLists.txt b/auxiliary/CMakeLists.txt index 470a7b0..3d61c88 100644 --- a/auxiliary/CMakeLists.txt +++ b/auxiliary/CMakeLists.txt @@ -31,8 +31,7 @@ set(CONFIG_FILE_PATH lib/cmake/${PROJECT_NAME}) configure_package_config_file(${PROJECT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake - INSTALL_DESTINATION ${CONFIG_FILE_PATH} - NO_CHECK_REQUIRED_COMPONENTS_MACRO) + INSTALL_DESTINATION ${CONFIG_FILE_PATH}) write_basic_package_version_file(${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake VERSION ${PROJECT_VERSION} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 24a11cd..0e23561 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,8 +28,7 @@ set(CONFIG_FILE_PATH lib/cmake/${PROJECT_NAME}) configure_package_config_file(${PROJECT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake - INSTALL_DESTINATION ${CONFIG_FILE_PATH} - NO_CHECK_REQUIRED_COMPONENTS_MACRO) + INSTALL_DESTINATION ${CONFIG_FILE_PATH}) write_basic_package_version_file(${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake VERSION ${PROJECT_VERSION}