Skip to content

Commit 3df41b3

Browse files
committed
Merge pull request opencv#9426 from borisfom:dispatch
2 parents 7b4f323 + b18983a commit 3df41b3

File tree

6 files changed

+852
-827
lines changed

6 files changed

+852
-827
lines changed

cmake/OpenCVModule.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,6 +1047,8 @@ function(ocv_add_perf_tests)
10471047
set(OPENCV_PERF_${the_module}_SOURCES ${perf_srcs} ${perf_hdrs})
10481048
endif()
10491049

1050+
ocv_compiler_optimization_process_sources(OPENCV_PERF_${the_module}_SOURCES OPENCV_PERF_${the_module}_DEPS ${the_target})
1051+
10501052
if(NOT BUILD_opencv_world)
10511053
get_native_precompiled_header(${the_target} perf_precomp.hpp)
10521054
endif()
@@ -1124,6 +1126,8 @@ function(ocv_add_accuracy_tests)
11241126
set(OPENCV_TEST_${the_module}_SOURCES ${test_srcs} ${test_hdrs})
11251127
endif()
11261128

1129+
ocv_compiler_optimization_process_sources(OPENCV_TEST_${the_module}_SOURCES OPENCV_TEST_${the_module}_DEPS ${the_target})
1130+
11271131
if(NOT BUILD_opencv_world)
11281132
get_native_precompiled_header(${the_target} test_precomp.hpp)
11291133
endif()

cmake/OpenCVUtils.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ macro(ocv_warnings_disable)
387387
endif(NOT ENABLE_NOISY_WARNINGS)
388388
endmacro()
389389

390-
macro(ocv_append_sourge_file_compile_definitions source)
390+
macro(ocv_append_source_file_compile_definitions source)
391391
get_source_file_property(_value "${source}" COMPILE_DEFINITIONS)
392392
if(_value)
393393
set(_value ${_value} ${ARGN})

modules/core/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,20 @@ ocv_glob_module_sources(SOURCES "${OPENCV_MODULE_opencv_core_BINARY_DIR}/version
3838

3939
ocv_module_include_directories(${the_module} ${ZLIB_INCLUDE_DIRS} ${OPENCL_INCLUDE_DIRS})
4040
if(ANDROID AND HAVE_CPUFEATURES)
41-
ocv_append_sourge_file_compile_definitions(${CMAKE_CURRENT_SOURCE_DIR}/src/system.cpp "HAVE_CPUFEATURES=1")
41+
ocv_append_source_file_compile_definitions(${CMAKE_CURRENT_SOURCE_DIR}/src/system.cpp "HAVE_CPUFEATURES=1")
4242
ocv_module_include_directories(${CPUFEATURES_INCLUDE_DIRS})
4343
endif()
4444
if(ITT_INCLUDE_DIRS)
4545
ocv_module_include_directories(${ITT_INCLUDE_DIRS})
4646
endif()
4747
if(HAVE_POSIX_MEMALIGN)
48-
ocv_append_sourge_file_compile_definitions(${CMAKE_CURRENT_SOURCE_DIR}/src/alloc.cpp "HAVE_POSIX_MEMALIGN=1")
48+
ocv_append_source_file_compile_definitions(${CMAKE_CURRENT_SOURCE_DIR}/src/alloc.cpp "HAVE_POSIX_MEMALIGN=1")
4949
endif()
5050
if(HAVE_MALLOC_H)
51-
ocv_append_sourge_file_compile_definitions(${CMAKE_CURRENT_SOURCE_DIR}/src/alloc.cpp "HAVE_MALLOC_H=1")
51+
ocv_append_source_file_compile_definitions(${CMAKE_CURRENT_SOURCE_DIR}/src/alloc.cpp "HAVE_MALLOC_H=1")
5252
endif()
5353
if(HAVE_MEMALIGN)
54-
ocv_append_sourge_file_compile_definitions(${CMAKE_CURRENT_SOURCE_DIR}/src/alloc.cpp "HAVE_MEMALIGN=1")
54+
ocv_append_source_file_compile_definitions(${CMAKE_CURRENT_SOURCE_DIR}/src/alloc.cpp "HAVE_MEMALIGN=1")
5555
endif()
5656

5757
ocv_create_module(${extra_libs})

0 commit comments

Comments
 (0)