@@ -2,19 +2,21 @@ if(NOT ANDROID)
2
2
message ("cpufeatures is ANDROID project" )
3
3
endif ()
4
4
5
+ ocv_update (OPENCV_CPUFEATURES_TARGET_NAME libcpufeatures )
6
+
5
7
set (CPUFEATURES_ROOT "${CMAKE_CURRENT_SOURCE_DIR} " CACHE PATH "Android cpufeatures project sources (for example, <android-ndk>/sources/android/cpufeatures)" )
6
8
7
9
set (CPUFEATURES_INCLUDE_DIRS ${CPUFEATURES_ROOT} CACHE INTERNAL "" )
8
- set (CPUFEATURES_LIBRARIES cpufeatures CACHE INTERNAL "" )
10
+ set (CPUFEATURES_LIBRARIES " ${OPENCV_CPUFEATURES_TARGET_NAME} " CACHE INTERNAL "" )
9
11
10
12
if (NOT DEFINED CPUFEATURES_SOURCES )
11
13
set (CPUFEATURES_SOURCES ${CPUFEATURES_ROOT} /cpu-features.c ${CPUFEATURES_ROOT} /cpu-features.h )
12
14
endif ()
13
15
14
16
include_directories (${CPUFEATURES_INCLUDE_DIRS} )
15
- add_library (cpufeatures STATIC ${CPUFEATURES_SOURCES} )
17
+ add_library (${OPENCV_CPUFEATURES_TARGET_NAME} STATIC ${CPUFEATURES_SOURCES} )
16
18
17
- set_target_properties (cpufeatures
19
+ set_target_properties (${OPENCV_CPUFEATURES_TARGET_NAME}
18
20
PROPERTIES OUTPUT_NAME cpufeatures
19
21
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX} "
20
22
COMPILE_PDB_NAME cpufeatures
@@ -23,9 +25,9 @@ set_target_properties(cpufeatures
23
25
)
24
26
25
27
if (ENABLE_SOLUTION_FOLDERS )
26
- set_target_properties (cpufeatures PROPERTIES FOLDER "3rdparty" )
28
+ set_target_properties (${OPENCV_CPUFEATURES_TARGET_NAME} PROPERTIES FOLDER "3rdparty" )
27
29
endif ()
28
30
29
31
if (NOT BUILD_SHARED_LIBS )
30
- ocv_install_target (cpufeatures EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev )
32
+ ocv_install_target (${OPENCV_CPUFEATURES_TARGET_NAME} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev )
31
33
endif ()
0 commit comments