Skip to content

Commit 1a77f86

Browse files
committed
chroe: 添加CI测试并生成缓存
1 parent 47ede07 commit 1a77f86

File tree

8 files changed

+15
-6
lines changed

8 files changed

+15
-6
lines changed

Diff for: .github/workflows/cmake.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
uses: lukka/run-cmake@v10
4444
with:
4545
configurePreset: ${{ env.BUILD_TYPE }}
46-
configurePresetAdditionalArgs: "['-DBUILD_SHARED_LIBS=${{ env.BUILD_SHARED_LIBS }}']"
46+
configurePresetAdditionalArgs: "['-DBUILD_SHARED_LIBS=${{ env.BUILD_SHARED_LIBS }}', '-DBUILD_TESTING=ON']"
4747

4848
- name: build
4949
run: cmake --build build --config ${{ env.BUILD_TYPE }}

Diff for: CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
4040
#=======================================================================================================================
4141
set(BUILD_TARGET_NAME libocr CACHE STRING "Build target_name" FORCE)
4242
set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libs")
43-
set(BUILD_TEST OFF CACHE BOOL "Build test")
43+
set(BUILD_TESTING OFF CACHE BOOL "Build test")
4444
set(ENABLE_LINKEDRESOURCE "not embed file" CACHE STRING "embed file status")
4545
#=======================================================================================================================
4646
set(include_dir ${CMAKE_SOURCE_DIR}/include)
@@ -69,7 +69,7 @@ find_package(OpenCV CONFIG REQUIRED)
6969
#=======================================================================================================================
7070
add_subdirectory(resource)
7171
add_subdirectory(source)
72-
if (BUILD_TEST)
72+
if (BUILD_TESTING)
7373
enable_testing()
7474
add_subdirectory(test)
7575
endif ()
@@ -80,7 +80,7 @@ message(STATUS "Config : ")
8080
message(STATUS " Version : ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
8181
message(STATUS " BUILD_TARGET_NAME : ${BUILD_TARGET_NAME}")
8282
message(STATUS " BUILD_SHARED_LIBS : ${BUILD_SHARED_LIBS}")
83-
message(STATUS " BUILD_TEST : ${BUILD_TEST}")
83+
message(STATUS " BUILD_TESTING : ${BUILD_TESTING}")
8484
message(STATUS "Model : ")
8585
message(STATUS " enable linked resource : ${ENABLE_LINKEDRESOURCE}")
8686
message(STATUS " model_rec_file : ${model_rec_file}")

Diff for: resource/version.ver

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.3.131
1+
0.3.142

Diff for: resource/version_hash.hash

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
740185a
1+
47ede07

Diff for: source/CMakeLists.txt

+3
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,7 @@ target_link_libraries(${BUILD_TARGET_NAME} PRIVATE ${BUILD_TARGET_NAME}::resourc
3838

3939
# 编译完成后,install到install目录
4040
install(TARGETS ${BUILD_TARGET_NAME})
41+
if (NOT BUILD_SHARED_LIBS)
42+
install(TARGETS ${BUILD_TARGET_NAME}_resource)
43+
endif()
4144
install(FILES ${include_dir}/libocr/libocr.h DESTINATION include/libocr)

Diff for: test/example_dynamiclink_loadtime/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,5 @@ COMMAND ${CMAKE_COMMAND} -E copy_if_different
3131
${CMAKE_CURRENT_SOURCE_DIR}/../image/test.png
3232
$<TARGET_FILE_DIR:example_dynamiclink_loadtime>
3333
)
34+
35+
install(TARGETS ${PROJECT_NAME})

Diff for: test/example_dynamiclink_runtime/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ COMMAND ${CMAKE_COMMAND} -E copy_if_different
2929
${CMAKE_CURRENT_SOURCE_DIR}/../image/test.png
3030
$<TARGET_FILE_DIR:example_dynamiclink_runtime>
3131
)
32+
33+
install(TARGETS ${PROJECT_NAME})

Diff for: test/example_staticlink_compiletime/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@ COMMAND ${CMAKE_COMMAND} -E copy_if_different
3232
${CMAKE_CURRENT_SOURCE_DIR}/../image/test.png
3333
$<TARGET_FILE_DIR:example_staticlink_compiletime>
3434
)
35+
36+
install(TARGETS ${PROJECT_NAME})

0 commit comments

Comments
 (0)