mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-15 22:20:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8345 from ChristofKaufmann:pch_gcc6_workaround

Browse Source
This commit is contained in:
Alexander Alekhin 2017-03-14 14:09:22 +00:00
commit b6e8de23f8
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/OpenCVPCHSupport.cmake
View File

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