summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-12-02 15:11:16 (GMT)
committerBrad King <brad.king@kitware.com>2020-12-02 15:19:16 (GMT)
commit2e67a75acdbdec24a4e14b2550b846f3ca916de0 (patch)
tree5619cb1db886005a29905d4792b65f1ec8b7a99b
parenta24a4e18af1d40d6bf81045c5955aa08b5e51797 (diff)
downloadCMake-2e67a75acdbdec24a4e14b2550b846f3ca916de0.zip
CMake-2e67a75acdbdec24a4e14b2550b846f3ca916de0.tar.gz
CMake-2e67a75acdbdec24a4e14b2550b846f3ca916de0.tar.bz2
Embarcadero: Simplify addition of -P flag for C++
-rw-r--r--Modules/Platform/Windows-Embarcadero.cmake8
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