chroe: 添加CI测试并生成缓存

GengGode · Aug 30, 2024 · 1a77f86 · 1a77f86
1 parent 47ede07
commit 1a77f86
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -43,7 +43,7 @@ jobs:
       uses: lukka/run-cmake@v10
       with:
         configurePreset: ${{ env.BUILD_TYPE }}
-        configurePresetAdditionalArgs: "['-DBUILD_SHARED_LIBS=${{ env.BUILD_SHARED_LIBS }}']"
+        configurePresetAdditionalArgs: "['-DBUILD_SHARED_LIBS=${{ env.BUILD_SHARED_LIBS }}', '-DBUILD_TESTING=ON']"
 
     - name: build
       run: cmake --build build --config ${{ env.BUILD_TYPE }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 #=======================================================================================================================
 set(BUILD_TARGET_NAME libocr CACHE STRING "Build target_name" FORCE)
 set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libs")
-set(BUILD_TEST OFF CACHE BOOL "Build test")
+set(BUILD_TESTING OFF CACHE BOOL "Build test")
 set(ENABLE_LINKEDRESOURCE "not embed file" CACHE STRING "embed file status")
 #=======================================================================================================================
 set(include_dir ${CMAKE_SOURCE_DIR}/include)
@@ -69,7 +69,7 @@ find_package(OpenCV CONFIG REQUIRED)
 #=======================================================================================================================
 add_subdirectory(resource)
 add_subdirectory(source)
-if (BUILD_TEST)
+if (BUILD_TESTING)
     enable_testing()
     add_subdirectory(test)
 endif ()
@@ -80,7 +80,7 @@ message(STATUS "Config : ")
 message(STATUS "    Version                     : ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 message(STATUS "    BUILD_TARGET_NAME           : ${BUILD_TARGET_NAME}")
 message(STATUS "    BUILD_SHARED_LIBS           : ${BUILD_SHARED_LIBS}")
-message(STATUS "    BUILD_TEST                  : ${BUILD_TEST}")
+message(STATUS "    BUILD_TESTING               : ${BUILD_TESTING}")
 message(STATUS "Model : ")
 message(STATUS "    enable linked resource      : ${ENABLE_LINKEDRESOURCE}")
 message(STATUS "    model_rec_file              : ${model_rec_file}")

diff --git a/resource/version.ver b/resource/version.ver
@@ -1 +1 @@
-0.3.131
+0.3.142
diff --git a/resource/version_hash.hash b/resource/version_hash.hash
@@ -1 +1 @@
-740185a
+47ede07
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -38,4 +38,7 @@ target_link_libraries(${BUILD_TARGET_NAME} PRIVATE ${BUILD_TARGET_NAME}::resourc
 
 # 编译完成后，install到install目录
 install(TARGETS ${BUILD_TARGET_NAME})
+if (NOT BUILD_SHARED_LIBS)
+    install(TARGETS ${BUILD_TARGET_NAME}_resource)
+endif()
 install(FILES ${include_dir}/libocr/libocr.h DESTINATION include/libocr)
diff --git a/test/example_dynamiclink_loadtime/CMakeLists.txt b/test/example_dynamiclink_loadtime/CMakeLists.txt
@@ -31,3 +31,5 @@ COMMAND ${CMAKE_COMMAND} -E copy_if_different
     ${CMAKE_CURRENT_SOURCE_DIR}/../image/test.png
     $<TARGET_FILE_DIR:example_dynamiclink_loadtime>
 )
+
+install(TARGETS ${PROJECT_NAME})
diff --git a/test/example_dynamiclink_runtime/CMakeLists.txt b/test/example_dynamiclink_runtime/CMakeLists.txt
@@ -29,3 +29,5 @@ COMMAND ${CMAKE_COMMAND} -E copy_if_different
     ${CMAKE_CURRENT_SOURCE_DIR}/../image/test.png 
     $<TARGET_FILE_DIR:example_dynamiclink_runtime>
 )
+
+install(TARGETS ${PROJECT_NAME})
diff --git a/test/example_staticlink_compiletime/CMakeLists.txt b/test/example_staticlink_compiletime/CMakeLists.txt
@@ -32,3 +32,5 @@ COMMAND ${CMAKE_COMMAND} -E copy_if_different
     ${CMAKE_CURRENT_SOURCE_DIR}/../image/test.png 
     $<TARGET_FILE_DIR:example_staticlink_compiletime>
 )
+
+install(TARGETS ${PROJECT_NAME})