diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-13 10:35:04 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-07-13 10:49:46 -0400 |
| commit | c736de7b284ecc93bac48106e88417e0e6c92ad6 (patch) | |
| tree | 4b543faa599c34bdc7db464cd26b53c9cb8737bb /Modules/CMakeASMInformation.cmake | |
| parent | 6f94b03c976088d177891ff69a9fad88de42e420 (diff) | |
| download | cmake-c736de7b284ecc93bac48106e88417e0e6c92ad6.tar.gz | |
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/CMakeASMInformation.cmake')
| -rw-r--r-- | Modules/CMakeASMInformation.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeASMInformation.cmake b/Modules/CMakeASMInformation.cmake index 62ef972a3a..0e547c4671 100644 --- a/Modules/CMakeASMInformation.cmake +++ b/Modules/CMakeASMInformation.cmake @@ -108,7 +108,7 @@ mark_as_advanced(CMAKE_ASM${ASM_DIALECT}_FLAGS if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT) - set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>") + set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>") endif() if(NOT CMAKE_ASM${ASM_DIALECT}_CREATE_STATIC_LIBRARY) |