Skip to content

O
opencv
Commit d66f3efd authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #12504 from kraj:3.4

parents f512bf70 a4f53988
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cmake/OpenCVUtils.cmake
View file @ d66f3efd
...@@ -259,7 +259,7 @@ function(ocv_include_directories) ...@@ -259,7 +259,7 @@ function(ocv_include_directories)
ocv_is_opencv_directory(__is_opencv_dir "${dir}") ocv_is_opencv_directory(__is_opencv_dir "${dir}")
if(__is_opencv_dir) if(__is_opencv_dir)
list(APPEND __add_before "${dir}") list(APPEND __add_before "${dir}")
elseif(CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND elseif(((CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0") OR CV_CLANG) AND
dir MATCHES "/usr/include$") dir MATCHES "/usr/include$")
# workaround for GCC 6.x bug # workaround for GCC 6.x bug
else() else()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment