Skip to content

Commit 9393a0c

Browse files
committed
cmake: don't use -isystem for opencv_contrib paths
1 parent fc5e32c commit 9393a0c

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

cmake/OpenCVUtils.cmake

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ function(ocv_include_directories)
8686
set(__add_before "")
8787
foreach(dir ${ARGN})
8888
get_filename_component(__abs_dir "${dir}" ABSOLUTE)
89-
if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}" OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}")
89+
if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}"
90+
OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}"
91+
OR (OPENCV_EXTRA_MODULES_PATH AND "${__abs_dir}" MATCHES "^${OPENCV_EXTRA_MODULES_PATH}"))
9092
list(APPEND __add_before "${dir}")
9193
else()
9294
include_directories(AFTER SYSTEM "${dir}")
@@ -101,7 +103,9 @@ function(ocv_target_include_directories target)
101103
set(__params "")
102104
foreach(dir ${ARGN})
103105
get_filename_component(__abs_dir "${dir}" ABSOLUTE)
104-
if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}" OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}")
106+
if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}"
107+
OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}"
108+
OR (OPENCV_EXTRA_MODULES_PATH AND "${__abs_dir}" MATCHES "^${OPENCV_EXTRA_MODULES_PATH}"))
105109
list(APPEND __params "${__abs_dir}")
106110
else()
107111
list(APPEND __params "${dir}")

0 commit comments

Comments
 (0)