diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-04 13:27:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-04 13:27:55 (GMT) |
| commit | 76685b985d9ec91f7ffa036cc2a43bca6477f6e9 (patch) | |
| tree | bb1ee84f0c5c16b3fb1a670fa4800c4afdfc1f0a /Modules/Platform | |
| parent | 16c0057a13282001a5de56a8eb434b299aea3282 (diff) | |
| parent | 48aac247e922409b4dfe7189521661df4b0583d1 (diff) | |
| download | CMake-76685b985d9ec91f7ffa036cc2a43bca6477f6e9.zip CMake-76685b985d9ec91f7ffa036cc2a43bca6477f6e9.tar.gz CMake-76685b985d9ec91f7ffa036cc2a43bca6477f6e9.tar.bz2 | |
Merge topic 'explicit-LANGUAGE-flag'
48aac247e9 Compile with explicit language flag when source LANGUAGE property is set
2e67a75acd Embarcadero: Simplify addition of -P flag for C++
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5522
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/Windows-Embarcadero.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/Platform/Windows-Embarcadero.cmake b/Modules/Platform/Windows-Embarcadero.cmake index 59f3ca5..8f1d024 100644 --- a/Modules/Platform/Windows-Embarcadero.cmake +++ b/Modules/Platform/Windows-Embarcadero.cmake @@ -35,8 +35,8 @@ else() set(_tR "-tR") # Target uses the dynamic RTL set(_tW "-tW") # Target is a Windows application endif() -set(_COMPILE_C "-c") -set(_COMPILE_CXX "-P -c") +set(_COMPILE_C "") +set(_COMPILE_CXX " -P") set(CMAKE_LIBRARY_PATH_FLAG "-L") set(CMAKE_LINK_LIBRARY_FLAG "") @@ -87,7 +87,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} -DWIN32 <DEFINES> <INCLUDES> <FLAGS> -o<OBJECT> ${_COMPILE_${lang}} <SOURCE>" + "<CMAKE_${lang}_COMPILER> ${_tR} -DWIN32 <DEFINES> <INCLUDES> <FLAGS> -o<OBJECT>${_COMPILE_${lang}} -c <SOURCE>" ) set(CMAKE_${lang}_LINK_EXECUTABLE @@ -98,7 +98,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 -DWIN32 <DEFINES> <INCLUDES> <FLAGS> -o<PREPROCESSED_SOURCE> ${_COMPILE_${lang}} <SOURCE>" + "cpp32 -DWIN32 <DEFINES> <INCLUDES> <FLAGS> -o<PREPROCESSED_SOURCE>${_COMPILE_${lang}} -c <SOURCE>" ) # Borland >= 5.6 allows -P option for cpp32, <= 5.5 does not |