Skip to content

O
opencv
Commit 583e3a68 authored by Christof Kaufmann's avatar Christof Kaufmann
Browse files
Options

cmake: Avoid adding default path as system directory for GCC 6.x 

This is a completion for PR #7390 and fixes #6517 and #815.
parent e4377e7c
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
cmake/OpenCVPCHSupport.cmake
View file @ 583e3a68
...@@ -65,6 +65,9 @@ MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags) ...@@ -65,6 +65,9 @@ MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
ocv_is_opencv_directory(__result ${item}) ocv_is_opencv_directory(__result ${item})
if(__result) if(__result)
LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}\"${item}\"") LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}\"${item}\"")
elseif(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND
item MATCHES "/usr/include$")
# workaround for GCC 6.x bug
else() else()
LIST(APPEND ${_out_compile_flags} "${_PCH_isystem_prefix}\"${item}\"") LIST(APPEND ${_out_compile_flags} "${_PCH_isystem_prefix}\"${item}\"")
endif() endif()
...@@ -75,6 +78,9 @@ MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags) ...@@ -75,6 +78,9 @@ MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
ocv_is_opencv_directory(__result ${item}) ocv_is_opencv_directory(__result ${item})
if(__result) if(__result)
LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}\"${item}\"") LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}\"${item}\"")
elseif(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND
item MATCHES "/usr/include$")
# workaround for GCC 6.x bug
else() else()
LIST(APPEND ${_out_compile_flags} "${_PCH_isystem_prefix}\"${item}\"") LIST(APPEND ${_out_compile_flags} "${_PCH_isystem_prefix}\"${item}\"")
endif() endif()
......
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