diff options
author | Brad King <brad.king@kitware.com> | 2015-07-14 14:34:28 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-07-14 14:34:28 (GMT) |
commit | ead29a4e3d1e01d7e6b43a27b1c15f7fb3b8ecb5 (patch) | |
tree | eba3402f6bb226d92b2d1d3cfeaaa6e13aaa6c2d /Modules/Compiler/SunPro-CXX.cmake | |
parent | 1b05417e3c04bccd38c9e0c6b4819508dcb25ccf (diff) | |
parent | c736de7b284ecc93bac48106e88417e0e6c92ad6 (diff) | |
download | CMake-ead29a4e3d1e01d7e6b43a27b1c15f7fb3b8ecb5.zip CMake-ead29a4e3d1e01d7e6b43a27b1c15f7fb3b8ecb5.tar.gz CMake-ead29a4e3d1e01d7e6b43a27b1c15f7fb3b8ecb5.tar.bz2 |
Merge topic 'refactor-rule-var-includes'
c736de7b Factor an <INCLUDES> placeholder out of <FLAGS> in rule variables
6f94b03c Place <DEFINES> before <FLAGS> consistently across compilers
Diffstat (limited to 'Modules/Compiler/SunPro-CXX.cmake')
-rw-r--r-- | Modules/Compiler/SunPro-CXX.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Compiler/SunPro-CXX.cmake b/Modules/Compiler/SunPro-CXX.cmake index 022b4d4..e0c02d9 100644 --- a/Modules/Compiler/SunPro-CXX.cmake +++ b/Modules/Compiler/SunPro-CXX.cmake @@ -22,8 +22,8 @@ foreach(type SHARED_LIBRARY SHARED_MODULE EXE) set(CMAKE_${type}_LINK_DYNAMIC_CXX_FLAGS "-Bdynamic") endforeach() -set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>") -set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -S <SOURCE> -o <ASSEMBLY_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> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>") # Create archives with "CC -xar" in case user adds "-instances=extern" # so that template instantiations are available to archive members. |