]> granicus.if.org Git - clang/commitdiff
[CMake] Properly quote string arguments to quiet errors from r327528 when built
authorFrederich Munch <colsebas@hotmail.com>
Wed, 14 Mar 2018 16:56:02 +0000 (16:56 +0000)
committerFrederich Munch <colsebas@hotmail.com>
Wed, 14 Mar 2018 16:56:02 +0000 (16:56 +0000)
with LLVM_ENABLE_EH and LLVM_ENABLE_RTTI.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@327531 91177308-0d34-0410-b5e6-96231b3b80d8

examples/clang-interpreter/CMakeLists.txt

index 063924e0075c298bab0812c1dc51784465a56d9b..c5ab076fc1c3b56421d1f33e3d3a99bf9e046094 100644 (file)
@@ -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