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
9b659736
Commit
9b659736
authored
Dec 22, 2017
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10394 from alalek:cmake_fix_pch_pic_pie
parents
69a6765b
6c252d8c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
0 deletions
+18
-0
OpenCVPCHSupport.cmake
cmake/OpenCVPCHSupport.cmake
+18
-0
No files found.
cmake/OpenCVPCHSupport.cmake
View file @
9b659736
...
@@ -261,6 +261,24 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input)
...
@@ -261,6 +261,24 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input)
endif
()
endif
()
endif
()
endif
()
if
(
type STREQUAL
"SHARED_LIBRARY"
OR type STREQUAL
"STATIC_LIBRARY"
)
get_target_property
(
__pic
${
_targetName
}
POSITION_INDEPENDENT_CODE
)
if
(
__pic AND CMAKE_CXX_COMPILE_OPTIONS_PIC
AND NOT OPENCV_SKIP_PCH_PIC_HANDLING
AND NOT OPENCV_SKIP_PCH_PIC_HANDLING_
${
_targetName
}
)
list
(
APPEND _compile_FLAGS
"
${
CMAKE_CXX_COMPILE_OPTIONS_PIC
}
"
)
endif
()
elseif
(
type STREQUAL
"EXECUTABLE"
)
get_target_property
(
__pie
${
_targetName
}
POSITION_INDEPENDENT_CODE
)
if
(
__pie AND CMAKE_CXX_COMPILE_OPTIONS_PIE
AND NOT OPENCV_SKIP_PCH_PIE_HANDLING
AND NOT OPENCV_SKIP_PCH_PIE_HANDLING_
${
_targetName
}
)
list
(
APPEND _compile_FLAGS
"
${
CMAKE_CXX_COMPILE_OPTIONS_PIE
}
"
)
endif
()
endif
()
get_target_property
(
DIRINC
${
_targetName
}
INCLUDE_DIRECTORIES
)
get_target_property
(
DIRINC
${
_targetName
}
INCLUDE_DIRECTORIES
)
set_target_properties
(
${
_targetName
}
_pch_dephelp PROPERTIES INCLUDE_DIRECTORIES
"
${
DIRINC
}
"
)
set_target_properties
(
${
_targetName
}
_pch_dephelp PROPERTIES INCLUDE_DIRECTORIES
"
${
DIRINC
}
"
)
...
...
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