- Update to r53061

[reactos.git] / cmake / compilerflags.cmake

diff --git a/cmake/compilerflags.cmake b/cmake/compilerflags.cmake
index 2ac31fd..55bd78d 100644 (file)
--- a/cmake/compilerflags.cmake
+++ b/cmake/compilerflags.cmake
@@ -1,33 +1,24 @@
-\r
-macro(add_compiler_flags)\r
-    # Adds the compiler flag to both CMAKE_C_FLAGS and CMAKE_CXX_FLAGS\r
-    foreach(flag ${ARGN})\r
-        set(flags_list "${flags_list} ${flag}")\r
-    endforeach()\r
-\r
-    if(CMAKE_C_FLAGS)\r
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flags_list}")\r
-    else()\r
-        set(CMAKE_C_FLAGS ${flags_list})\r
-    endif()\r
-\r
-    if(CMAKE_CXX_FLAGS)\r
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flags_list}")\r
-    else()\r
-        set(CMAKE_CXX_FLAGS ${flags_list})\r
-    endif()\r
-endmacro()\r
-\r
-macro(add_linkerflag MODULE _flag)\r
-    set(NEW_LINKER_FLAGS ${_flag})\r
-    get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS)\r
-    if(LINKER_FLAGS)\r
-        set(NEW_LINKER_FLAGS "${LINKER_FLAGS} ${NEW_LINKER_FLAGS}")\r
-    endif()\r
-    set_target_properties(${MODULE} PROPERTIES LINK_FLAGS ${NEW_LINKER_FLAGS})\r
-endmacro()\r
-\r
-macro(set_unicode)\r
-   add_definitions(-DUNICODE -D_UNICODE)\r
-   set(IS_UNICODE 1)\r
-endmacro()\r
+
+function(add_compiler_flags)
+    # Adds the compiler flag to both CMAKE_C_FLAGS and CMAKE_CXX_FLAGS
+    foreach(flag ${ARGN})
+        set(flags_list "${flags_list} ${flag}")
+    endforeach()
+
+       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flags_list}" PARENT_SCOPE)
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flags_list}" PARENT_SCOPE)
+endfunction()
+
+function(add_linkerflag MODULE _flag)
+    set(NEW_LINKER_FLAGS ${_flag})
+    get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS)
+    if(LINKER_FLAGS)
+        set(NEW_LINKER_FLAGS "${LINKER_FLAGS} ${NEW_LINKER_FLAGS}")
+    endif()
+    set_target_properties(${MODULE} PROPERTIES LINK_FLAGS ${NEW_LINKER_FLAGS})
+endfunction()
+
+macro(set_unicode)
+   add_definitions(-DUNICODE -D_UNICODE)
+   set(IS_UNICODE 1)
+endmacro()