| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From fa76d8646bb2b9b514728eeef41afed7c43a36f2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 11 Sep 2018 18:18:33 -0700 |
| 4 | Subject: [PATCH] Check for clang before using -isystem |
| 5 | |
| 6 | When cross compiling with clang, the internal C++ headers are not found |
| 7 | when adding sysroot to -isystem, that is redundant anyway because it |
| 8 | will look for headers insider --sysroot path with same quality as it |
| 9 | would do with -isystem otherwise |
| 10 | |
| 11 | Upstream-Status: Submitted [https://github.com/opencv/opencv/pull/12504] |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | --- |
| 14 | cmake/OpenCVUtils.cmake | 2 +- |
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake |
| 18 | index fae91c165f..60c20192dc 100644 |
| 19 | --- a/cmake/OpenCVUtils.cmake |
| 20 | +++ b/cmake/OpenCVUtils.cmake |
| 21 | @@ -259,7 +259,7 @@ function(ocv_include_directories) |
| 22 | ocv_is_opencv_directory(__is_opencv_dir "${dir}") |
| 23 | if(__is_opencv_dir) |
| 24 | list(APPEND __add_before "${dir}") |
| 25 | - elseif(CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND |
| 26 | + elseif(((CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0") OR CV_CLANG) AND |
| 27 | dir MATCHES "/usr/include$") |
| 28 | # workaround for GCC 6.x bug |
| 29 | else() |
| 30 | -- |
| 31 | 2.18.0 |
| 32 | |