Skip to content

Commit 3ca6a72

Browse files
committed
Merge pull request opencv#14222 from alalek:cmake_remove_test_include_dirs
2 parents 7d2118e + 2a2d195 commit 3ca6a72

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

cmake/OpenCVModule.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,7 +1145,7 @@ function(ocv_add_perf_tests)
11451145

11461146
source_group("Src" FILES "${${the_target}_pch}")
11471147
ocv_add_executable(${the_target} ${OPENCV_PERF_${the_module}_SOURCES} ${${the_target}_pch})
1148-
ocv_target_include_modules(${the_target} ${perf_deps} "${perf_path}")
1148+
ocv_target_include_modules(${the_target} ${perf_deps})
11491149
ocv_target_link_libraries(${the_target} LINK_PRIVATE ${perf_deps} ${OPENCV_MODULE_${the_module}_DEPS} ${OPENCV_LINKER_LIBS} ${OPENCV_PERF_${the_module}_DEPS})
11501150
add_dependencies(opencv_perf_tests ${the_target})
11511151

@@ -1227,7 +1227,7 @@ function(ocv_add_accuracy_tests)
12271227

12281228
source_group("Src" FILES "${${the_target}_pch}")
12291229
ocv_add_executable(${the_target} ${OPENCV_TEST_${the_module}_SOURCES} ${${the_target}_pch})
1230-
ocv_target_include_modules(${the_target} ${test_deps} "${test_path}")
1230+
ocv_target_include_modules(${the_target} ${test_deps})
12311231
if(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/test")
12321232
ocv_target_include_directories(${the_target} "${CMAKE_CURRENT_BINARY_DIR}/test")
12331233
endif()

cmake/OpenCVPCHSupport.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input)
261261
)
262262

263263
_PCH_GET_COMPILE_FLAGS(_compile_FLAGS)
264+
list(APPEND _compile_FLAGS "${_PCH_include_prefix}\"${_path}\"")
264265

265266
get_target_property(type ${_targetName} TYPE)
266267
if(type STREQUAL "SHARED_LIBRARY")

0 commit comments

Comments
 (0)