| diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake |
| index 28ccc1c6be4f..b0e1cbf77287 100644 |
| --- a/cmake/OpenCVPCHSupport.cmake |
| +++ b/cmake/OpenCVPCHSupport.cmake |
| @@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX) |
| ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion |
| OUTPUT_VARIABLE gcc_compiler_version) |
| #MESSAGE("GCC Version: ${gcc_compiler_version}") |
| - IF(gcc_compiler_version VERSION_GREATER "4.2.-1") |
| + IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0") |
| SET(PCHSupport_FOUND TRUE) |
| ENDIF() |
| |
| diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake |
| index 3a23cd73633d..1fea1578b1d9 100644 |
| --- a/cmake/OpenCVUtils.cmake |
| +++ b/cmake/OpenCVUtils.cmake |
| @@ -76,7 +76,11 @@ function(ocv_include_directories) |
| if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}" OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}") |
| list(APPEND __add_before "${dir}") |
| else() |
| - include_directories(AFTER SYSTEM "${dir}") |
| + if (gcc_compiler_version VERSION_LESS "6.0.0") |
| + include_directories(AFTER SYSTEM "${dir}") |
| + else() |
| + include_directories(AFTER "${dir}") |
| + endif() |
| endif() |
| endforeach() |
| include_directories(BEFORE ${__add_before}) |