X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=reactos%2Fcmake%2Fgcc.cmake;h=3ea234358151fca56b42d20ff5ab5824000fbf3a;hp=a8707d66e5939d3ee31daa7dd4b47cb11d5f81c0;hb=079f80ff567c3ead09061e7a6d165c77294eb3eb;hpb=5caee6abdffb656898691a85c28a02476868491c;ds=sidebyside

diff --git a/reactos/cmake/gcc.cmake b/reactos/cmake/gcc.cmake
index a8707d66e59..3ea23435815 100644
--- a/reactos/cmake/gcc.cmake
+++ b/reactos/cmake/gcc.cmake
@@ -1,54 +1,54 @@
 
 # Compiler Core
-add_compiler_flags(-pipe -fms-extensions)
+add_compile_flags("-pipe -fms-extensions")
 
 # Debugging (Note: DWARF-4 on 4.5.1 when we ship)
-add_compiler_flags(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types)
+add_compile_flags("-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types")
 
 # Tuning
 if(ARCH MATCHES i386)
-    add_compiler_flags(-march=${OARCH} -mtune=${TUNE})
+    add_compile_flags("-march=${OARCH} -mtune=${TUNE}")
 else()
-    add_compiler_flags(-march=${OARCH})
+    add_compile_flags("-march=${OARCH}")
 endif()
 
 # Warnings
-add_compiler_flags(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value -Winvalid-pch)
+add_compile_flags("-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value -Winvalid-pch")
 
 if(ARCH MATCHES amd64)
-    add_compiler_flags(-Wno-format)
+    add_compile_flags("-Wno-format")
 elseif(ARCH MATCHES arm)
-    add_compiler_flags(-Wno-attributes)
+    add_compile_flags("-Wno-attributes")
 endif()
 
 # Optimizations
 if(OPTIMIZE STREQUAL "1")
-    add_compiler_flags(-Os)
+    add_compile_flags("-Os")
 elseif(OPTIMIZE STREQUAL "2")
-    add_compiler_flags(-Os)
+    add_compile_flags("-Os")
 elseif(OPTIMIZE STREQUAL "3")
-    add_compiler_flags(-O1)
+    add_compile_flags("-O1")
 elseif(OPTIMIZE STREQUAL "4")
-    add_compiler_flags(-O2)
+    add_compile_flags("-O2")
 elseif(OPTIMIZE STREQUAL "5")
-    add_compiler_flags(-O3)
+    add_compile_flags("-O3")
 endif()
 
-add_compiler_flags(-fno-strict-aliasing)
+add_compile_flags("-fno-strict-aliasing")
 
 if(ARCH MATCHES i386)
-    add_compiler_flags(-mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer)
+    add_compile_flags("-mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer")
     if(OPTIMIZE STREQUAL "1")
-        add_compiler_flags(-ftracer -momit-leaf-frame-pointer)
+        add_compile_flags("-ftracer -momit-leaf-frame-pointer")
     endif()
 elseif(ARCH MATCHES amd64)
-    add_compiler_flags(-mpreferred-stack-boundary=4)
+    add_compile_flags("-mpreferred-stack-boundary=4")
     if(OPTIMIZE STREQUAL "1")
-        add_compiler_flags(-ftracer -momit-leaf-frame-pointer)
+        add_compile_flags("-ftracer -momit-leaf-frame-pointer")
     endif()
 elseif(ARCH MATCHES arm)
     if(OPTIMIZE STREQUAL "1")
-        add_compiler_flags(-ftracer)
+        add_compile_flags("-ftracer")
     endif()
 endif()
 
@@ -100,24 +100,24 @@ set(CMAKE_RC_COMPILE_OBJECT
 # Optional 3rd parameter: stdcall stack bytes
 function(set_entrypoint MODULE ENTRYPOINT)
     if(${ENTRYPOINT} STREQUAL "0")
-        add_linkerflag(${MODULE} "-Wl,-entry,0")
+        add_target_link_flags(${MODULE} "-Wl,-entry,0")
     elseif(ARCH MATCHES i386)
         set(_entrysymbol _${ENTRYPOINT})
         if (${ARGC} GREATER 2)
             set(_entrysymbol ${_entrysymbol}@${ARGV2})
         endif()
-        add_linkerflag(${MODULE} "-Wl,-entry,${_entrysymbol}")
+        add_target_link_flags(${MODULE} "-Wl,-entry,${_entrysymbol}")
     else()
-        add_linkerflag(${MODULE} "-Wl,-entry,${ENTRYPOINT}")
+        add_target_link_flags(${MODULE} "-Wl,-entry,${ENTRYPOINT}")
     endif()
 endfunction()
 
 function(set_subsystem MODULE SUBSYSTEM)
-    add_linkerflag(${MODULE} "-Wl,--subsystem,${SUBSYSTEM}")
+    add_target_link_flags(${MODULE} "-Wl,--subsystem,${SUBSYSTEM}")
 endfunction()
 
 function(set_image_base MODULE IMAGE_BASE)
-    add_linkerflag(${MODULE} "-Wl,--image-base,${IMAGE_BASE}")
+    add_target_link_flags(${MODULE} "-Wl,--image-base,${IMAGE_BASE}")
 endfunction()
 
 function(set_module_type MODULE TYPE)
@@ -158,7 +158,8 @@ function(set_module_type MODULE TYPE)
         set_entrypoint(${MODULE} DllMainCRTStartup 12)
         set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl")
     elseif(${TYPE} MATCHES kernelmodedriver)
-        set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000" SUFFIX ".sys")
+        add_target_link_flags(${MODULE} "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000")
+        set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys")
         set_entrypoint(${MODULE} DriverEntry 8)
         set_subsystem(${MODULE} native)
         set_image_base(${MODULE} 0x00010000)
@@ -342,7 +343,7 @@ if(PCH)
                 set_source_files_properties(${_item} PROPERTIES COMPILE_FLAGS "-fpch-preprocess" OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_gch_filename})
             endif()
         endforeach()
-        #set dependency checking : depends on precompiled header only whixh already depends on deeper header
+        #set dependency checking : depends on precompiled header only which already depends on deeper header
         set_target_properties(${_target_name} PROPERTIES IMPLICIT_DEPENDS_INCLUDE_TRANSFORM "\"${_basename}\"=;<${_basename}>=")
     endmacro()
 else()