Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修复c层库的导出符号导致的jni和exec编译错误 #371

Merged
merged 1 commit into from
Aug 26, 2021
Merged

修复c层库的导出符号导致的jni和exec编译错误 #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cpp_projects/OcrLiteNcnn/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ elseif(OCR_CLIB) # C LIB
target_link_libraries(OcrLiteNcnn ncnn ${OpenCV_LIBS} ${OpenMP_CXX_LIB_NAMES})
else ()
add_executable(OcrLiteNcnn ${OCR_COMPILE_CODE})
target_compile_definitions(OcrLiteNcnn PRIVATE __EXEC__)
target_link_libraries(OcrLiteNcnn ncnn ${OpenCV_LIBS} ${OpenMP_CXX_LIB_NAMES})
endif ()

Expand All @@ -136,6 +137,7 @@ if (OCR_BENCHMARK AND NOT OCR_LIB AND NOT OCR_CLIB)
src/OcrLite.cpp
src/OcrUtils.cpp)
target_link_libraries(benchmark ncnn ${OpenCV_LIBS} ${OpenMP_CXX_LIB_NAMES})
target_compile_definitions(benchmark PRIVATE __EXEC__)
if (OCR_OPENMP)
target_compile_definitions(benchmark PRIVATE __OPENMP__)
endif ()
Expand Down
14 changes: 11 additions & 3 deletions cpp_projects/OcrLiteNcnn/include/OcrLitePort.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#pragma once
#if !defined(__JNI__) && !defined(__EXEC__)

// The way how the function is called
#if !defined(OCRLITE_CALL)
Expand All @@ -9,7 +9,7 @@
#else
#define OCRLITE_CALL
#endif /* _WIN32 */
#endif /* ISSCALL */
#endif /* OCRLITE_CALL */

#if defined _WIN32 || defined __CYGWIN__
#define OCRLITE_EXPORT __declspec(dllexport)
Expand All @@ -34,4 +34,12 @@

#define OCR_API OCRLITE_PORT OCRLITE_CALL

#define OCR_LOCAL OCRLITE_LOCAL OCRLITE_CALL
#define OCR_LOCAL OCRLITE_LOCAL OCRLITE_CALL

#else // __JNI__ || __EXEC__

#define OCRLITE_PORT
#define OCR_API
#define OCR_LOCAL

#endif // __JNI__ || __EXEC__
2 changes: 2 additions & 0 deletions cpp_projects/OcrLiteOnnx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ elseif(OCR_CLIB) # C LIB
target_link_libraries(OcrLiteOnnx ${OnnxRuntime_LIBS} ${OpenCV_LIBS} ${OpenMP_CXX_LIB_NAMES})
else ()
add_executable(OcrLiteOnnx ${OCR_COMPILE_CODE})
target_compile_definitions(OcrLiteOnnx PRIVATE __EXEC__)
target_link_libraries(OcrLiteOnnx ${OnnxRuntime_LIBS} ${OpenCV_LIBS} ${OpenMP_CXX_LIB_NAMES})
endif ()

Expand All @@ -133,6 +134,7 @@ if (OCR_BENCHMARK AND NOT OCR_LIB AND NOT OCR_CLIB)
src/OcrLite.cpp
src/OcrUtils.cpp)
target_link_libraries(benchmark ${OnnxRuntime_LIBS} ${OpenCV_LIBS} ${OpenMP_CXX_LIB_NAMES})
target_compile_definitions(benchmark PRIVATE __EXEC__)
if (OCR_OPENMP)
target_compile_definitions(benchmark PRIVATE __OPENMP__)
endif ()
Expand Down
14 changes: 11 additions & 3 deletions cpp_projects/OcrLiteOnnx/include/OcrLitePort.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#pragma once
#if !defined(__JNI__) && !defined(__EXEC__)

// The way how the function is called
#if !defined(OCRLITE_CALL)
Expand All @@ -9,7 +9,7 @@
#else
#define OCRLITE_CALL
#endif /* _WIN32 */
#endif /* ISSCALL */
#endif /* OCRLITE_CALL */

#if defined _WIN32 || defined __CYGWIN__
#define OCRLITE_EXPORT __declspec(dllexport)
Expand All @@ -34,4 +34,12 @@

#define OCR_API OCRLITE_PORT OCRLITE_CALL

#define OCR_LOCAL OCRLITE_LOCAL OCRLITE_CALL
#define OCR_LOCAL OCRLITE_LOCAL OCRLITE_CALL

#else // __JNI__ || __EXEC__

#define OCRLITE_PORT
#define OCR_API
#define OCR_LOCAL

#endif // __JNI__ || __EXEC__