Skip to content

Commit ef2da70

Browse files
committed
fix:win编译clib,install缺少lib文件的问题,修改CMakeLists添加includes文件
1 parent a6e0039 commit ef2da70

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

CMakeLists.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,20 +103,21 @@ if (OCR_OUTPUT STREQUAL "JNI") # JNI
103103
add_library(OcrLiteNcnn SHARED ${OCR_COMPILE_CODE})
104104
target_compile_definitions(OcrLiteNcnn PRIVATE __JNI__)
105105
target_link_libraries(OcrLiteNcnn ncnn ${OpenCV_LIBS} ${JNI_LIBS} ${OpenMP_CXX_LIB_NAMES})
106-
elseif(OCR_OUTPUT STREQUAL "CLIB") # C LIB
106+
elseif(OCR_OUTPUT STREQUAL "CLIB") # CLIB
107107
add_library(OcrLiteNcnn SHARED ${OCR_COMPILE_CODE})
108108
target_compile_definitions(OcrLiteNcnn PRIVATE __CLIB__)
109109
target_link_libraries(OcrLiteNcnn ncnn ${OpenCV_LIBS} ${OpenMP_CXX_LIB_NAMES})
110-
elseif(OCR_OUTPUT STREQUAL "BIN") # C LIB
110+
elseif(OCR_OUTPUT STREQUAL "BIN") # BIN
111111
add_executable(OcrLiteNcnn ${OCR_COMPILE_CODE})
112112
target_compile_definitions(OcrLiteNcnn PRIVATE __EXEC__)
113113
target_link_libraries(OcrLiteNcnn ncnn ${OpenCV_LIBS} ${OpenMP_CXX_LIB_NAMES})
114114
endif ()
115115

116-
install(TARGETS OcrLiteNcnn EXPORT OcrLiteNcnn
117-
ARCHIVE DESTINATION staticlib
118-
LIBRARY DESTINATION sharedlib
119-
RUNTIME DESTINATION bin)
116+
install(TARGETS OcrLiteNcnn EXPORT OcrLiteNcnn)
117+
if (OCR_OUTPUT STREQUAL "CLIB") # CLIB
118+
file(GLOB OCR_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h)
119+
install(FILES ${OCR_INCLUDE} DESTINATION include)
120+
endif ()
120121

121122
if (OCR_VULKAN STREQUAL "GPU")
122123
target_compile_definitions(OcrLiteNcnn PRIVATE __VULKAN__)

build.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ echo.
2525

2626
echo "请注意:如果选择2)JNI动态库时,必须安装配置Oracle JDK"
2727
echo "请选择编译输出类型并回车: 1)BIN可执行文件,2)JNI动态库,3)C动态库"
28-
set BUILD_OUTPUT="EXE"
2928
set /p flag=
3029
if %flag% == 1 (set BUILD_OUTPUT="BIN")^
3130
else if %flag% == 2 (set BUILD_OUTPUT="JNI")^

generate-vs-project.bat

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ else if %flag% == 2 (set BUILD_NCNN_VULKAN="GPU")^
2323
else (echo "输入错误!Input Error!")
2424
echo.
2525

26-
echo "请注意:如果选择2)编译为JNI动态库时,必须安装配置Oracle JDK"
27-
echo "请选择编译输出类型并回车: 1)编译成可执行文件,2)编译成JNI动态库,3)编译成C动态库"
28-
set BUILD_OUTPUT="EXE"
26+
echo "请注意:如果选择2)JNI动态库时,必须安装配置Oracle JDK"
27+
echo "请选择编译输出类型并回车: 1)BIN可执行文件,2)JNI动态库,3)C动态库"
2928
set /p flag=
3029
if %flag% == 1 (set BUILD_OUTPUT="BIN")^
3130
else if %flag% == 2 (set BUILD_OUTPUT="JNI")^

0 commit comments

Comments
 (0)