Skip to content

Commit b10ab79

Browse files
authored
Merge pull request opencv#17468 from liqi-c:sharedlib_build_problem
TEngine installation rules fix for static build * Modify cmake config error for -DBUILD_SHARED_LIBS=OFF * Modify for not install tengine include directory * Update compile error. * move install command to tengine/CMakeLists.txt * rm include dir when make install,only build static lib will install libtengine.a
1 parent 619462b commit b10ab79

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

3rdparty/libtengine/tengine.cmake

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# sqfu@openailab.com
2323
#
2424

25-
SET(TENGINE_COMMIT_VERSION "2f3cd86217f3530c8e4a82f3ed5af14c7a4e3943")
25+
SET(TENGINE_COMMIT_VERSION "8a4c58e0e05cd850f4bb0936a330edc86dc0e28c")
2626
SET(OCV_TENGINE_DIR "${OpenCV_BINARY_DIR}/3rdparty/libtengine")
2727
SET(OCV_TENGINE_SOURCE_PATH "${OCV_TENGINE_DIR}/Tengine-${TENGINE_COMMIT_VERSION}")
2828

@@ -34,7 +34,7 @@ IF(EXISTS "${OCV_TENGINE_SOURCE_PATH}")
3434
ELSE()
3535
SET(OCV_TENGINE_FILENAME "${TENGINE_COMMIT_VERSION}.zip")#name2
3636
SET(OCV_TENGINE_URL "https://github.com/OAID/Tengine/archive/") #url2
37-
SET(tengine_md5sum 9124324b6e2b350012e46ae1db4bad7d) #md5sum2
37+
SET(tengine_md5sum f51ca8f3963faeeff3f019a6f6edc206) #md5sum2
3838

3939
#MESSAGE(STATUS "**** TENGINE DOWNLOAD BEGIN ****")
4040
ocv_download(FILENAME ${OCV_TENGINE_FILENAME}
@@ -69,15 +69,13 @@ if(BUILD_TENGINE)
6969
elseif(${ANDROID_ABI} STREQUAL "arm64-v8a")
7070
SET(CONFIG_ARCH_ARM64 ON)
7171
endif()
72-
SET(Tengine_LIB "tengine" CACHE INTERNAL "")
7372
else()
7473
# linux system
7574
if(CMAKE_SYSTEM_PROCESSOR STREQUAL arm)
7675
SET(CONFIG_ARCH_ARM32 ON)
7776
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) ## AARCH64
7877
SET(CONFIG_ARCH_ARM64 ON)
7978
endif()
80-
SET(Tengine_LIB "tengine" CACHE INTERNAL "")
8179
endif()
8280

8381
SET(BUILT_IN_OPENCV ON) ## set for tengine compile discern .
@@ -86,6 +84,6 @@ if(BUILD_TENGINE)
8684
add_subdirectory("${OCV_TENGINE_SOURCE_PATH}" "${OCV_TENGINE_DIR}/build")
8785
else()
8886
message(WARNING "TENGINE: Missing 'CMakeLists.txt' in source code package: ${OCV_TENGINE_SOURCE_PATH}")
89-
SET(HAVE_TENGINE 1)
9087
endif()
88+
SET(Tengine_LIB "tengine" CACHE INTERNAL "")
9189
endif()

0 commit comments

Comments
 (0)