diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-13 14:27:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-07-13 14:49:46 (GMT) |
| commit | 6f94b03c976088d177891ff69a9fad88de42e420 (patch) | |
| tree | 8e3ee7f6b68e1349ca7e8f01905c8e9d988ce31c /Modules/Platform/Windows-Embarcadero.cmake | |
| parent | 179aa0bb0a8654efe6e3e606afdf104dbfeb3881 (diff) | |
| download | CMake-6f94b03c976088d177891ff69a9fad88de42e420.zip CMake-6f94b03c976088d177891ff69a9fad88de42e420.tar.gz CMake-6f94b03c976088d177891ff69a9fad88de42e420.tar.bz2 | |
Place <DEFINES> before <FLAGS> consistently across compilers
Update our values for
CMAKE_<LANG>_COMPILE_OBJECT,
CMAKE_<LANG>_CREATE_ASSEMBLY_SOURCE, and
CMAKE_<LANG>_CREATE_PREPROCESSED_SOURCE
to place <DEFINES> before <FLAGS> consistently across supported
compilers. We already do this for most compilers, so update the rest
for consistency.
Diffstat (limited to 'Modules/Platform/Windows-Embarcadero.cmake')
| -rw-r--r-- | Modules/Platform/Windows-Embarcadero.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Platform/Windows-Embarcadero.cmake b/Modules/Platform/Windows-Embarcadero.cmake index 58ef3ca..04f6bc2 100644 --- a/Modules/Platform/Windows-Embarcadero.cmake +++ b/Modules/Platform/Windows-Embarcadero.cmake @@ -90,7 +90,7 @@ macro(__embarcadero_language lang) # place <DEFINES> outside the response file because Borland refuses # to parse quotes from the response file. set(CMAKE_${lang}_COMPILE_OBJECT - "<CMAKE_${lang}_COMPILER> ${_tR} <DEFINES> -DWIN32 -o<OBJECT> <FLAGS> ${_COMPILE_${lang}} <SOURCE>" + "<CMAKE_${lang}_COMPILER> ${_tR} -DWIN32 <DEFINES> <FLAGS> -o<OBJECT> ${_COMPILE_${lang}} <SOURCE>" ) set(CMAKE_${lang}_LINK_EXECUTABLE @@ -101,7 +101,7 @@ macro(__embarcadero_language lang) # place <DEFINES> outside the response file because Borland refuses # to parse quotes from the response file. set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE - "cpp32 <DEFINES> -DWIN32 <FLAGS> -o<PREPROCESSED_SOURCE> ${_COMPILE_${lang}} <SOURCE>" + "cpp32 -DWIN32 <DEFINES> <FLAGS> -o<PREPROCESSED_SOURCE> ${_COMPILE_${lang}} <SOURCE>" ) # Borland >= 5.6 allows -P option for cpp32, <= 5.5 does not |