From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Mon, 22 Nov 2010 12:25:25 +0000 (+0000)
Subject: [CMAKE]
X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~445
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=674c35dcd7e77ff7f7ce145ab08da61ef7ffaaae

[CMAKE]
No precompiled headers for MSVC atm

svn path=/branches/cmake-bringup/; revision=49705
---

diff --git a/CMakeMacros.cmake b/CMakeMacros.cmake
index af13ce0d28f..8f867df446d 100644
--- a/CMakeMacros.cmake
+++ b/CMakeMacros.cmake
@@ -1,31 +1,4 @@
 
-MACRO(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename)
-
-    # Add the precompiled header to the build
-    get_filename_component(FILE ${_header_filename} NAME)
-    set(_gch_filename "${_target_name}_${FILE}.gch")
-    list(APPEND ${_out_compile_flags} -c ${_header_filename} -o ${_gch_filename})
-
-    # This gets us our includes
-    get_directory_property(DIRINC INCLUDE_DIRECTORIES)
-    foreach(item ${DIRINC})
-        list(APPEND ${_out_compile_flags} -I${item})
-    endforeach(item) 
-
-    # This is a particular bit of undocumented/hacky magic I'm quite proud of
-    get_directory_property(_compiler_flags DEFINITIONS)
-    string(REPLACE "\ " "\t" _compiler_flags ${_compiler_flags})
-    list(APPEND ${_out_compile_flags} ${_compiler_flags})
-
-    # This gets any specific definitions that were added with set-target-property
-    get_target_property(_target_defs ${_target_name} COMPILE_DEFINITIONS)
-    if (_target_defs)
-        foreach(item ${_target_defs})
-            list(APPEND ${_out_compile_flags} -D${item})
-        endforeach(item)
-    endif()
-
-ENDMACRO(_PCH_GET_COMPILE_FLAGS) 
 
 if (NOT MSVC)
 MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)
diff --git a/gcc.cmake b/gcc.cmake
index 2f5225c2f47..f35d6397ee4 100644
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -33,6 +33,32 @@ add_definitions(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-e
 add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls)
 
 # Macros
+MACRO(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename)
+    # Add the precompiled header to the build
+    get_filename_component(FILE ${_header_filename} NAME)
+    set(_gch_filename "${_target_name}_${FILE}.gch")
+    list(APPEND ${_out_compile_flags} -c ${_header_filename} -o ${_gch_filename})
+
+    # This gets us our includes
+    get_directory_property(DIRINC INCLUDE_DIRECTORIES)
+    foreach(item ${DIRINC})
+        list(APPEND ${_out_compile_flags} -I${item})
+    endforeach(item) 
+
+    # This is a particular bit of undocumented/hacky magic I'm quite proud of
+    get_directory_property(_compiler_flags DEFINITIONS)
+    string(REPLACE "\ " "\t" _compiler_flags ${_compiler_flags})
+    list(APPEND ${_out_compile_flags} ${_compiler_flags})
+
+    # This gets any specific definitions that were added with set-target-property
+    get_target_property(_target_defs ${_target_name} COMPILE_DEFINITIONS)
+    if (_target_defs)
+        foreach(item ${_target_defs})
+            list(APPEND ${_out_compile_flags} -D${item})
+        endforeach(item)
+    endif()
+ENDMACRO(_PCH_GET_COMPILE_FLAGS) 
+
 MACRO(add_pch _target_name _header_filename _src_list)
     get_filename_component(FILE ${_header_filename} NAME)
     set(_gch_filename "${_target_name}_${FILE}.gch")
diff --git a/msc.cmake b/msc.cmake
index 413da1c90b1..9317ac62120 100644
--- a/msc.cmake
+++ b/msc.cmake
@@ -26,12 +26,9 @@ set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_F
 MACRO(add_pch _target_name _header_filename _src_list)
     get_filename_component(FILE ${_header_filename} NAME)
     set(_gch_filename "${_target_name}_${FILE}.gch")
-    list(APPEND ${_src_list} ${_gch_filename})
-    _PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename})
-    file(REMOVE ${_gch_filename})
     add_custom_command(
         OUTPUT ${_gch_filename}
-        COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args}
+        COMMAND echo Ignoring precompiled header
         DEPENDS ${_header_filename})
 ENDMACRO(add_pch _target_name _header_filename _src_list)