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/IAR-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/IAR-CXX.cmake')
| -rw-r--r-- | Modules/Compiler/IAR-CXX.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/Compiler/IAR-CXX.cmake b/Modules/Compiler/IAR-CXX.cmake index eae9d1b..03ecdf1 100644 --- a/Modules/Compiler/IAR-CXX.cmake +++ b/Modules/Compiler/IAR-CXX.cmake @@ -2,10 +2,10 @@ include(Compiler/IAR) -set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <SOURCE> <DEFINES> <FLAGS> -o <OBJECT>") +set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT>") -set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <SOURCE> <DEFINES> <FLAGS> --preprocess=cnl <PREPROCESSED_SOURCE>") -set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <SOURCE> <DEFINES> <FLAGS> -lAH <ASSEMBLY_SOURCE> -o <OBJECT>.dummy") +set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <SOURCE> <DEFINES> <INCLUDES> <FLAGS> --preprocess=cnl <PREPROCESSED_SOURCE>") +set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -lAH <ASSEMBLY_SOURCE> -o <OBJECT>.dummy") |