[CMAKE]

No precompiled headers for MSVC atm

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

diff --git a/CMakeMacros.cmake b/CMakeMacros.cmake
index af13ce0..8f867df 100644 (file)
--- a/CMakeMacros.cmake
+++ b/CMakeMacros.cmake
@@ -1,31 +1,4 @@
 \r
-MACRO(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename)\r
-\r
-    # Add the precompiled header to the build\r
-    get_filename_component(FILE ${_header_filename} NAME)\r
-    set(_gch_filename "${_target_name}_${FILE}.gch")\r
-    list(APPEND ${_out_compile_flags} -c ${_header_filename} -o ${_gch_filename})\r
-\r
-    # This gets us our includes\r
-    get_directory_property(DIRINC INCLUDE_DIRECTORIES)\r
-    foreach(item ${DIRINC})\r
-        list(APPEND ${_out_compile_flags} -I${item})\r
-    endforeach(item) \r
-\r
-    # This is a particular bit of undocumented/hacky magic I'm quite proud of\r
-    get_directory_property(_compiler_flags DEFINITIONS)\r
-    string(REPLACE "\ " "\t" _compiler_flags ${_compiler_flags})\r
-    list(APPEND ${_out_compile_flags} ${_compiler_flags})\r
-\r
-    # This gets any specific definitions that were added with set-target-property\r
-    get_target_property(_target_defs ${_target_name} COMPILE_DEFINITIONS)\r
-    if (_target_defs)\r
-        foreach(item ${_target_defs})\r
-            list(APPEND ${_out_compile_flags} -D${item})\r
-        endforeach(item)\r
-    endif()\r
-\r
-ENDMACRO(_PCH_GET_COMPILE_FLAGS) \r
 \r
 if (NOT MSVC)\r
 MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)\r

diff --git a/gcc.cmake b/gcc.cmake
index 2f5225c..f35d639 100644 (file)
--- 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 413da1c..9317ac6 100644 (file)
--- 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)\r
     get_filename_component(FILE ${_header_filename} NAME)\r
     set(_gch_filename "${_target_name}_${FILE}.gch")\r
-    list(APPEND ${_src_list} ${_gch_filename})\r
-    _PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename})\r
-    file(REMOVE ${_gch_filename})\r
     add_custom_command(\r
         OUTPUT ${_gch_filename}\r
-        COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args}\r
+        COMMAND echo Ignoring precompiled header\r
         DEPENDS ${_header_filename})\r
 ENDMACRO(add_pch _target_name _header_filename _src_list)\r
 \r