Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
583e3a68
Commit
583e3a68
authored
Mar 09, 2017
by
Christof Kaufmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
1 changed file
with
6 additions
and
0 deletions
+6
-0
OpenCVPCHSupport.cmake
cmake/OpenCVPCHSupport.cmake
+6
-0
No files found.
cmake/OpenCVPCHSupport.cmake
View file @
583e3a68
...
...
@@ -65,6 +65,9 @@ MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
ocv_is_opencv_directory
(
__result
${
item
}
)
if
(
__result
)
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
()
LIST
(
APPEND
${
_out_compile_flags
}
"
${
_PCH_isystem_prefix
}
\"
${
item
}
\"
"
)
endif
()
...
...
@@ -75,6 +78,9 @@ MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
ocv_is_opencv_directory
(
__result
${
item
}
)
if
(
__result
)
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
()
LIST
(
APPEND
${
_out_compile_flags
}
"
${
_PCH_isystem_prefix
}
\"
${
item
}
\"
"
)
endif
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment