Author: marsupial
Date: Wed Mar 14 09:56:02 2018
New Revision: 327531
URL: http://llvm.org/viewvc/llvm-project?rev=327531&view=rev
Log:
[CMake] Properly quote string arguments to quiet errors from r327528 when built
with LLVM_ENABLE_EH and LLVM_ENABLE_RTTI.
Modified:
cfe/trunk/examples/clang-interpreter/CMakeLists.txt
Modified: cfe/trunk/examples/clang-interpreter/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/examples/clang-interpreter/CMakeLists.txt?rev=327531&r1=327530&r2=327531&view=diff
==============================================================================
--- cfe/trunk/examples/clang-interpreter/CMakeLists.txt (original)
+++ cfe/trunk/examples/clang-interpreter/CMakeLists.txt Wed Mar 14 09:56:02 2018
@@ -42,7 +42,7 @@ function(clang_enable_exceptions TARGET)
# of how LLVM is being built.
if (NOT LLVM_REQUIRES_EH AND NOT LLVM_REQUIRES_RTTI)
if (MSVC)
- # /EHs to allow throwing rom extern "C"
+ # /EHs to allow throwing from extern "C"
set(excptnExceptions_ON "/D _HAS_EXCEPTIONS=1 /EHs /wd4714")
set(excptnExceptions_OFF "/D _HAS_EXCEPTIONS=0 /EHs-c-")
set(excptnRTTI_ON "/GR")
@@ -68,14 +68,14 @@ function(clang_enable_exceptions TARGET)
# Strip the exception & rtti flags from the target
get_property(addedFlags TARGET ${TARGET} PROPERTY COMPILE_FLAGS)
- string(REGEX REPLACE ${excptnEHRTTIRegEx} "" editedFlags ${addedFlags})
- string(REPLACE ${excptnRTTI_OFF} "" editedFlags ${editedFlags})
- set_property(TARGET ${TARGET} PROPERTY COMPILE_FLAGS ${editedFlags})
+ string(REGEX REPLACE ${excptnEHRTTIRegEx} "" editedFlags "${addedFlags}")
+ string(REPLACE ${excptnRTTI_OFF} "" editedFlags "${editedFlags}")
+ set_property(TARGET ${TARGET} PROPERTY COMPILE_FLAGS "${editedFlags}")
get_property(addedFlags TARGET ${TARGET} PROPERTY COMPILE_DEFINITIONS)
- string(REGEX REPLACE ${excptnEHRTTIRegEx} "" editedFlags ${addedFlags})
- string(REPLACE ${excptnRTTI_OFF} "" editedFlags ${editedFlags})
- set_property(TARGET ${TARGET} PROPERTY COMPILE_DEFINITIONS ${editedFlags})
+ string(REGEX REPLACE ${excptnEHRTTIRegEx} "" editedFlags "${addedFlags}")
+ string(REPLACE ${excptnRTTI_OFF} "" editedFlags "${editedFlags}")
+ set_property(TARGET ${TARGET} PROPERTY COMPILE_DEFINITIONS
"${editedFlags}")
# Re-add the exception & rtti flags from LLVM
set_property(SOURCE main.cpp APPEND_STRING PROPERTY COMPILE_FLAGS
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
