diff --git a/CMakeLists.txt b/CMakeLists.txt index 7aba8e6..b2910ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,18 +1,18 @@ cmake_minimum_required(VERSION 3.15.2) - # 设置工程名称和语言 -project(LIBLBFGS VERSION 1.1.0) +project(LibLBFGS VERSION 1.1.0) +# 添加配置配件编写的函数 +include(CMakePackageConfigHelpers) + +if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") + set(CMAKE_INSTALL_PREFIX D:/Library) +else() + set(CMAKE_INSTALL_PREFIX /opt/stow/liblbfgs) +endif() message(STATUS "Platform: " ${CMAKE_HOST_SYSTEM_NAME}) -if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") - #set(CMAKE_C_COMPILER gcc) - #set(CMAKE_CXX_COMPILER g++) - set(CMAKE_INSTALL_PREFIX D:/Library) -endif() message(STATUS "Install prefix: " ${CMAKE_INSTALL_PREFIX}) - -# 添加源文件地址 -add_subdirectory(src/) +message(STATUS "Build type: " ${CMAKE_BUILD_TYPE}) # 添加编译选项 option(HAVE_CONFIG_H "use config.h" ON) @@ -23,3 +23,6 @@ configure_file( "${PROJECT_SOURCE_DIR}/config.h.in" "${PROJECT_SOURCE_DIR}/src/lib/config.h" ) + +# 添加源文件地址 +add_subdirectory(src/) \ No newline at end of file diff --git a/LibLBFGSConfig.cmake.in b/LibLBFGSConfig.cmake.in new file mode 100644 index 0000000..0976d54 --- /dev/null +++ b/LibLBFGSConfig.cmake.in @@ -0,0 +1,15 @@ +@PACKAGE_INIT@ + +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@_INCULDE_DIR "${PACKAGE_PREFIX_DIR}/include") +set_and_check(@PROJECT_NAME@_LIB_DIR "${PACKAGE_PREFIX_DIR}/lib") +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 diff --git a/config.sh b/config.sh deleted file mode 100755 index b55f394..0000000 --- a/config.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -cmd=${1} -package=liblbfgs -address=/opt - -if [[ ${cmd} == "configure" && ! -d "build/" ]]; then - mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=${address}/stow/${package} -DCMAKE_BUILD_TYPE=Release -elif [[ ${cmd} == "configure" ]]; then - cd build && rm -rf * && cmake .. -DCMAKE_INSTALL_PREFIX=${address}/stow/${package} -DCMAKE_BUILD_TYPE=Release -elif [[ ${cmd} == "build" ]]; then - cd build && make -elif [[ ${cmd} == "install" ]]; then - cd build && sudo make install - sudo stow --dir=${address}/stow --target=${address} ${package} -fi \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ebd0638..09c96de 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,7 +13,7 @@ set_target_properties(lbfgs_static PROPERTIES OUTPUT_NAME "lbfgs") 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 1.1 SOVERSION 1.1) +set_target_properties(lbfgs PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}) # 设置库文件的输出地址 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) # 在LINUX中需添加math库 @@ -26,8 +26,19 @@ if(UNIX AND NOT APPLE) endif() # 添加编译命令 -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3") + +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) + +write_basic_package_version_file(${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake + VERSION ${PROJECT_VERSION} + COMPATIBILITY SameMajorVersion) # 库的安装命令 if(WIN32) @@ -35,8 +46,15 @@ if(WIN32) install(TARGETS lbfgs_static DESTINATION lib) else() install(TARGETS lbfgs lbfgs_static - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + EXPORT ${PROJECT_NAME}Targets + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + install(EXPORT ${PROJECT_NAME}Targets + DESTINATION ${CONFIG_FILE_PATH}) + install(FILES + ${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake + ${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake + DESTINATION ${CONFIG_FILE_PATH}) endif() # 头文件安装命令 install(FILES lib/lbfgs.h DESTINATION include) @@ -50,7 +68,7 @@ macro(add_sample name file) # 添加可执行文件 命令行 add_executable(${name} sample/${file}) # 为安装文件添加动态库的搜索地址 在Windows下并没有什么用 直接忽略 - set_target_properties(${name} PROPERTIES INSTALL_RPATH "/opt/lib") + set_target_properties(${name} PROPERTIES INSTALL_RPATH ${PACKAGE_PREFIX_DIR}/lib) # 链接动态库 target_link_libraries(${name} PUBLIC lbfgs) endmacro() diff --git a/stow-config.sh b/stow-config.sh new file mode 100755 index 0000000..22da2a3 --- /dev/null +++ b/stow-config.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +sudo stow --dir=/opt/stow --target=/usr/local liblbfgs \ No newline at end of file