From a396674115fa430f6e7cb78c1d8d047f58ec4949 Mon Sep 17 00:00:00 2001 From: yizhangss Date: Fri, 16 Dec 2022 14:24:40 +0800 Subject: [PATCH] tmp update --- LibLBFGSConfig.cmake.in | 7 ++++--- src/CMakeLists.txt | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/LibLBFGSConfig.cmake.in b/LibLBFGSConfig.cmake.in index a50e832..349960f 100644 --- a/LibLBFGSConfig.cmake.in +++ b/LibLBFGSConfig.cmake.in @@ -1,6 +1,6 @@ @PACKAGE_INIT@ -set(@PROJECT_NAME@_Version "@PROJECT_VERSION@") +set(@PROJECT_NAME@_VERSION "@PROJECT_VERSION@") 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@_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/include") @@ -9,7 +9,8 @@ set_and_check(@PROJECT_NAME@_LIBRARY_DIR "${PACKAGE_PREFIX_DIR}/lib") set(@PROJECT_NAME@_LIB lbfgs) set(@PROJECT_NAME@_LIBRARY lbfgs) -set(@PROJECT_NAME@_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/src/CMakeLists.txt b/src/CMakeLists.txt index 7374d43..5d61ef6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,6 +14,10 @@ set_target_properties(lbfgs PROPERTIES CLEAN_DIRECT_OUTPUT 1) set_target_properties(lbfgs_static PROPERTIES CLEAN_DIRECT_OUTPUT 1) # 设置动态库的版本号 set_target_properties(lbfgs PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}) +# 设置动态库的运行搜索地址 +set_target_properties(lbfgs PROPERTIES INSTALL_RPATH /usr/local/lib) +set_target_properties(lbfgs_static PROPERTIES INSTALL_RPATH /usr/local/lib) + # 设置库文件的输出地址 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) # 在LINUX中需添加math库 @@ -33,8 +37,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}