Skip to content

Commit 19c9174

Browse files
committed
cmake: rename cpufeatures target
It is configurable via OPENCV_CPUFEATURES_TARGET_NAME variable
1 parent 520da7a commit 19c9174

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

3rdparty/cpufeatures/CMakeLists.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@ if(NOT ANDROID)
22
message("cpufeatures is ANDROID project")
33
endif()
44

5+
ocv_update(OPENCV_CPUFEATURES_TARGET_NAME libcpufeatures)
6+
57
set(CPUFEATURES_ROOT "${CMAKE_CURRENT_SOURCE_DIR}" CACHE PATH "Android cpufeatures project sources (for example, <android-ndk>/sources/android/cpufeatures)")
68

79
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 "")
911

1012
if(NOT DEFINED CPUFEATURES_SOURCES)
1113
set(CPUFEATURES_SOURCES ${CPUFEATURES_ROOT}/cpu-features.c ${CPUFEATURES_ROOT}/cpu-features.h)
1214
endif()
1315

1416
include_directories(${CPUFEATURES_INCLUDE_DIRS})
15-
add_library(cpufeatures STATIC ${CPUFEATURES_SOURCES})
17+
add_library(${OPENCV_CPUFEATURES_TARGET_NAME} STATIC ${CPUFEATURES_SOURCES})
1618

17-
set_target_properties(cpufeatures
19+
set_target_properties(${OPENCV_CPUFEATURES_TARGET_NAME}
1820
PROPERTIES OUTPUT_NAME cpufeatures
1921
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
2022
COMPILE_PDB_NAME cpufeatures
@@ -23,9 +25,9 @@ set_target_properties(cpufeatures
2325
)
2426

2527
if(ENABLE_SOLUTION_FOLDERS)
26-
set_target_properties(cpufeatures PROPERTIES FOLDER "3rdparty")
28+
set_target_properties(${OPENCV_CPUFEATURES_TARGET_NAME} PROPERTIES FOLDER "3rdparty")
2729
endif()
2830

2931
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)
3133
endif()

0 commit comments

Comments
 (0)