summaryrefslogtreecommitdiffstats
path: root/Modules/Platform/HP-UX-HP-CXX.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-07-13 14:35:04 (GMT)
committerBrad King <brad.king@kitware.com>2015-07-13 14:49:46 (GMT)
commitc736de7b284ecc93bac48106e88417e0e6c92ad6 (patch)
tree4b543faa599c34bdc7db464cd26b53c9cb8737bb /Modules/Platform/HP-UX-HP-CXX.cmake
parent6f94b03c976088d177891ff69a9fad88de42e420 (diff)
downloadCMake-c736de7b284ecc93bac48106e88417e0e6c92ad6.zip
CMake-c736de7b284ecc93bac48106e88417e0e6c92ad6.tar.gz
CMake-c736de7b284ecc93bac48106e88417e0e6c92ad6.tar.bz2
Factor an <INCLUDES> placeholder out of <FLAGS> in rule variables
Teach the Makefile and Ninja generators to substitute for an <INCLUDES> placeholder instead of putting -I in <FLAGS>. Update our values for CMAKE_<LANG>_COMPILE_OBJECT, CMAKE_<LANG>_CREATE_ASSEMBLY_SOURCE, and CMAKE_<LANG>_CREATE_PREPROCESSED_SOURCE to place <INCLUDES> just before <FLAGS>.
Diffstat (limited to 'Modules/Platform/HP-UX-HP-CXX.cmake')
-rw-r--r--Modules/Platform/HP-UX-HP-CXX.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Platform/HP-UX-HP-CXX.cmake b/Modules/Platform/HP-UX-HP-CXX.cmake
index dfa1e4e..6d90191 100644
--- a/Modules/Platform/HP-UX-HP-CXX.cmake
+++ b/Modules/Platform/HP-UX-HP-CXX.cmake
@@ -1,9 +1,9 @@
include(Platform/HP-UX-HP)
__hpux_compiler_hp(CXX)
-set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
+set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE
- "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -S <SOURCE>"
+ "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE>"
"mv `basename \"<SOURCE>\" | sed 's/\\.[^./]*$$//'`.s <ASSEMBLY_SOURCE>"
"rm -f `basename \"<SOURCE>\" | sed 's/\\.[^./]*$$//'`.o"
)