From 4da9ec435178a89fe8ba66985226a0e8723d3937 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Sat, 28 Aug 2021 12:28:16 +0800 Subject: [PATCH] add config.cmake.in --- CMakeLists.txt | 17 ++++++----- LICENSE.txt | 0 LibMagTessConfig.cmake.in | 15 +++++++++ README.md | 0 config.sh | 17 ----------- lib/CMakeLists.txt | 64 +++++++++++++++++++++++---------------- stow-config.sh | 3 ++ toolkits/CMakeLists.txt | 20 +++--------- 8 files changed, 70 insertions(+), 66 deletions(-) mode change 100755 => 100644 LICENSE.txt create mode 100644 LibMagTessConfig.cmake.in mode change 100755 => 100644 README.md delete mode 100755 config.sh create mode 100755 stow-config.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index d6514ce..b90f300 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,15 +1,18 @@ cmake_minimum_required(VERSION 3.15.2) # 设置项目名称与语言 -project(LIBMAGTESS VERSION 1.0) -# 设置安装地址 -message(STATUS "Platform: " ${CMAKE_HOST_SYSTEM_NAME}) -if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") - # 使用MinGW GCC编译时需取消注释 - #set(CMAKE_C_COMPILER gcc) - #set(CMAKE_CXX_COMPILER g++) +project(LibMagTess VERSION 1.0) +# 添加配置配件编写的函数 +include(CMakePackageConfigHelpers) + +if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") set(CMAKE_INSTALL_PREFIX D:/Library) +else() + set(CMAKE_INSTALL_PREFIX /opt/stow/magtess) endif() + +message(STATUS "Platform: " ${CMAKE_HOST_SYSTEM_NAME}) message(STATUS "Install prefix: " ${CMAKE_INSTALL_PREFIX}) +message(STATUS "Build type: " ${CMAKE_BUILD_TYPE}) # 添加库源文件地址 add_subdirectory(lib) diff --git a/LICENSE.txt b/LICENSE.txt old mode 100755 new mode 100644 diff --git a/LibMagTessConfig.cmake.in b/LibMagTessConfig.cmake.in new file mode 100644 index 0000000..3f777c0 --- /dev/null +++ b/LibMagTessConfig.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 magtess) +set(@PROJECT_NAME@_LIBRARY magtess) +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/README.md b/README.md old mode 100755 new mode 100644 diff --git a/config.sh b/config.sh deleted file mode 100755 index dab3518..0000000 --- a/config.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -cmd=${1} -package=magtess -address=/opt/stow -targetdir=/usr/local - -if [[ ${cmd} == "configure" && ! -d "build/" ]]; then - mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=${address}/${package} -DCMAKE_BUILD_TYPE=Release -elif [[ ${cmd} == "configure" ]]; then - cd build && rm -rf * && cmake .. -DCMAKE_INSTALL_PREFIX=${address}/${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} --target=${targetdir} ${package} -fi \ No newline at end of file diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 5ecd092..b6075c9 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,18 +1,18 @@ +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3") if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") - # 添加openblas库的地址 - include_directories(D:/Library/include) -endif() - -if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -lopenblas -lm -O2") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lopenblas -lm -O2") -endif() - -if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -framework Accelerate -O2") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -framework Accelerate -O2") + # set OpenBLAS directory manually + set(OpenBLAS_DIR D:/Library/lib/cmake/openblas) + find_library(OpenBLAS REQUIRED) + include_directories(${OpenBLAS_INCLUDE_DIRS}) +elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") + # set OpenBLAS directory manually + set(OpenBLAS_DIR /opt/homebrew/Cellar/openblas/0.3.17/lib/cmake/openblas) + find_package(OpenBLAS REQUIRED) + include_directories(${OpenBLAS_INCLUDE_DIRS}) +elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -lm") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lm") endif() # 设置库文件的输出地址 @@ -33,29 +33,41 @@ set_target_properties(magtess_static PROPERTIES OUTPUT_NAME "magtess") set_target_properties(magtess PROPERTIES CLEAN_DIRECT_OUTPUT 1) set_target_properties(magtess_static PROPERTIES CLEAN_DIRECT_OUTPUT 1) # 设置动态库的版本号 -set_target_properties(magtess PROPERTIES VERSION 1.0 SOVERSION 1.0) +set_target_properties(magtess PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}) +target_link_libraries(magtess PUBLIC ${OpenBLAS_LIBRARIES}) +target_link_libraries(magtess_static ${OpenBLAS_LIBRARIES}) if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux") - target_link_libraries(magtess PUBLIC openblas) target_link_libraries(magtess PUBLIC m) -elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") - # - find_library(OPENBLAS_LIBRARY libopenblas D:/Library/lib) - target_link_libraries(magtess PUBLIC ${OPENBLAS_LIBRARY}) - target_link_libraries(magtess_static ${OPENBLAS_LIBRARY}) endif() +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) install(TARGETS magtess DESTINATION lib) install(TARGETS magtess_static DESTINATION lib) else() install(TARGETS magtess magtess_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() -# 头文件安装命令 file(GLOB LIBMEGTESS_HEAD *.h) - -install(FILES ${LIBMEGTESS_HEAD} DESTINATION include/magtess) \ No newline at end of file +install(FILES ${LIBMEGTESS_HEAD} DESTINATION include/magtess) diff --git a/stow-config.sh b/stow-config.sh new file mode 100755 index 0000000..a4ef05e --- /dev/null +++ b/stow-config.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +sudo stow --dir=/opt/stow --target=/usr/local magtess \ No newline at end of file diff --git a/toolkits/CMakeLists.txt b/toolkits/CMakeLists.txt index 5719ad6..0c5f3bf 100644 --- a/toolkits/CMakeLists.txt +++ b/toolkits/CMakeLists.txt @@ -1,18 +1,6 @@ # 设置编译选项 -if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") -endif() - -if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -lopenblas -lm -O2") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lopenblas -lm -O2") -endif() - -if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -framework Accelerate -O2") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -framework Accelerate -O2") -endif() +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3") # 设置可执行文件的输出地址 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin/toolkits) @@ -22,7 +10,7 @@ macro(add_tools name) # 添加可执行程序名称 add_executable(${name} ${name}.cpp) # 设置安装后的动态库调用地址 - set_target_properties(${name} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) + set_target_properties(${name} PROPERTIES INSTALL_RPATH ${PACKAGE_PREFIX_DIR}/lib) # 链接动态库 target_link_libraries(${name} PUBLIC magtess) # 将可执行程序安装到bin @@ -40,7 +28,7 @@ if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_HOST_SYSTEM_NAME} STREQ # 添加可执行程序名称 add_executable(tessutil_magnetize_model tessutil_magnetize_model.c) # 设置安装后的动态库调用地址 - set_target_properties(tessutil_magnetize_model PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) + set_target_properties(tessutil_magnetize_model PROPERTIES INSTALL_RPATH ${PACKAGE_PREFIX_DIR}/lib) # 链接动态库 target_link_libraries(tessutil_magnetize_model PUBLIC magtess) # 将可执行程序安装到bin