Factorize generator flags

Author: layus

CMakeLists.txt

@@ -11,6 +11,13 @@ include(MozartProperties)
 set(MOZART_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(MOZART_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 
+set(DEFAULT_MOZART_GENERATOR_FLAGS
+      "--std=c++0x"
+      "-Wno-invalid-noreturn"
+      "-Wno-return-type"
+      "-Wno-braced-scalar-init" # Silence warning for macro ATOMIC_FLAG_INIT in atomic_base.h
+   )
+
 # Some helpers when using MinGW
 if(MINGW)
   get_filename_component(CMAKE_MAKE_PROGRAM_PATH "${CMAKE_MAKE_PROGRAM}" PATH)
@@ -32,7 +39,9 @@ if(MINGW)
   set(DEFAULT_MOZART_GENERATOR_FLAGS
         "-I${MINGW_ROOT}/${GCC_ARCH_TRIPLE}/include/c++"
         "-I${MINGW_ROOT}/${GCC_ARCH_TRIPLE}/include/c++/${GCC_ARCH_TRIPLE}"
-        "-I${MINGW_ROOT}/${GCC_ARCH_TRIPLE}/include")  
+        "-I${MINGW_ROOT}/${GCC_ARCH_TRIPLE}/include"
+        ${DEFAULT_MOZART_GENERATOR_FLAGS}
+     )
 
   set(BOOST_ROOT "${MINGW_ROOT}"
       CACHE PATH "Path where Boost is installed")
@@ -42,8 +51,6 @@ if(MINGW)
       enable_language(RC)
         set(CMAKE_RC_COMPILE_OBJECT
 	    "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
-else()
-  set(DEFAULT_MOZART_GENERATOR_FLAGS "")
 endif()
 
 # Some configuration

vm/boostenv/main/CMakeLists.txt

@@ -47,8 +47,7 @@ add_custom_command(
   OUTPUT ${GENERATED_BOOSTSOURCES_BINARY_DIR}/boostenv.gen
 
   # First pass: generate data types and interfaces
-  COMMAND ${clang_bin} "${CXX_STD_OPT}"
-    -Wno-invalid-noreturn -Wno-return-type
+  COMMAND ${clang_bin}
     -o ${GENERATED_BOOSTSOURCES_BINARY_DIR}/boostenv.ast
     -I ${Boost_INCLUDE_DIRS}
     -I ${CMAKE_CURRENT_SOURCE_DIR}/../../vm/main
@@ -60,8 +59,7 @@ add_custom_command(
     ${GENERATED_BOOSTSOURCES_BINARY_DIR}/
 
   # Second pass: generate builtin information
-  COMMAND ${clang_bin} "${CXX_STD_OPT}"
-    -Wno-invalid-noreturn -Wno-return-type
+  COMMAND ${clang_bin}
     -o ${GENERATED_BOOSTSOURCES_BINARY_DIR}/boostenvmodules.astbi
     -I ${Boost_INCLUDE_DIRS}
     -I ${GENERATED_BOOSTSOURCES_BINARY_DIR}

vm/vm/main/CMakeLists.txt

@@ -21,8 +21,7 @@ add_custom_command(
   OUTPUT ${GENERATED_SOURCES_BINARY_DIR}/mozart.gen
 
   # First pass: generate data types and interfaces
-  COMMAND ${clang_bin} -std=c++0x
-    -Wno-invalid-noreturn -Wno-return-type
+  COMMAND ${clang_bin}
     -o ${GENERATED_SOURCES_BINARY_DIR}/mozart.ast
     -DMOZART_GENERATOR
     ${MOZART_GENERATOR_FLAGS}
@@ -32,8 +31,7 @@ add_custom_command(
     ${GENERATED_SOURCES_BINARY_DIR}/
 
   # Second pass: generate builtin information
-  COMMAND ${clang_bin} -std=c++0x
-    -Wno-invalid-noreturn -Wno-return-type
+  COMMAND ${clang_bin}
     -o ${GENERATED_SOURCES_BINARY_DIR}/coremodules.astbi
     -I ${GENERATED_SOURCES_BINARY_DIR}
     -DMOZART_BUILTIN_GENERATOR