Merging r258611:

[oota-llvm.git] / cmake / modules / AddLLVMDefinitions.cmake

diff --git a/cmake/modules/AddLLVMDefinitions.cmake b/cmake/modules/AddLLVMDefinitions.cmake
index 0f6d81f736d514b5733220c7784fc5fad3390b5e..dab16236d3e9fa4d845c7325d99a8d04120e463d 100644 (file)
--- a/cmake/modules/AddLLVMDefinitions.cmake
+++ b/cmake/modules/AddLLVMDefinitions.cmake
@@ -1,11 +1,17 @@
-# There is no clear way of keeping track of compiler command-line\r
-# options chosen via `add_definitions', so we need our own method for\r
-# using it on tools/llvm-config/CMakeLists.txt.\r
-\r
-# Beware that there is no implementation of remove_llvm_definitions.\r
-\r
-macro(add_llvm_definitions)\r
-  set(LLVM_DEFINITIONS "${LLVM_DEFINITIONS} ${ARGN}")\r
-  add_definitions( ${ARGN} )\r
-endmacro(add_llvm_definitions)\r
-\r
+# There is no clear way of keeping track of compiler command-line
+# options chosen via `add_definitions', so we need our own method for
+# using it on tools/llvm-config/CMakeLists.txt.
+
+# Beware that there is no implementation of remove_llvm_definitions.
+
+macro(add_llvm_definitions)
+  # We don't want no semicolons on LLVM_DEFINITIONS:
+  foreach(arg ${ARGN})
+    if(DEFINED LLVM_DEFINITIONS)
+      set(LLVM_DEFINITIONS "${LLVM_DEFINITIONS} ${arg}")
+    else()
+      set(LLVM_DEFINITIONS ${arg})
+    endif()
+  endforeach(arg)
+  add_definitions( ${ARGN} )
+endmacro(add_llvm_definitions)