mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12504 from kraj:3.4

Browse Source
This commit is contained in:
Alexander Alekhin 2018-09-13 14:19:25 +00:00
commit d66f3efd36
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVUtils.cmake
View File

@ -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()