[ros-diffs] [jgardou] 53116: [CMAKE] - add the possibility to add dependencies to PCH. - Use it to fix advapi32 build

[jgardou at svn.reactos.org]

Author: jgardou
Date: Sun Aug  7 11:13:45 2011
New Revision: 53116

URL: http://svn.reactos.org/svn/reactos?rev=53116&view=rev
Log:
[CMAKE]
- add the possibility to add dependencies to PCH.
- Use it to fix advapi32 build

Modified:
    trunk/reactos/cmake/gcc.cmake
    trunk/reactos/cmake/idl-support.cmake
    trunk/reactos/dll/win32/advapi32/CMakeLists.txt

Modified: trunk/reactos/cmake/gcc.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=53116&r1=53115&r2=53116&view=diff
==============================================================================
--- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Aug  7 11:13:45 2011
@@ -334,7 +334,10 @@
             set(__compiler ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1})
         endif()
 
-        add_custom_command(OUTPUT ${_gch_filename} COMMAND ${__compiler} ${_args} IMPLICIT_DEPENDS ${__lang} ${_header_filename})
+        add_custom_command(OUTPUT ${_gch_filename}
+            COMMAND ${__compiler} ${_args}
+            IMPLICIT_DEPENDS ${__lang} ${_header_filename}
+            DEPENDS ${_header_filename} ${ARGN})
         get_target_property(_src_files ${_target_name} SOURCES)
         foreach(_item in ${_src_files})
             get_source_file_property(__src_lang ${_item} LANGUAGE)

Modified: trunk/reactos/cmake/idl-support.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/idl-support.cmake?rev=53116&r1=53115&r2=53116&view=diff
==============================================================================
--- trunk/reactos/cmake/idl-support.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/idl-support.cmake [iso-8859-1] Sun Aug  7 11:13:45 2011
@@ -138,7 +138,6 @@
         if(NOT IS_ABSOLUTE ${FILE})
             set(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE})
         endif()
-        file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h)
         add_custom_command(
             OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h
             COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h ${__server_client} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${FILE}

Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLists.txt?rev=53116&r1=53115&r2=53116&view=diff
==============================================================================
--- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Sun Aug  7 11:13:45 2011
@@ -65,6 +65,8 @@
 
 add_importlibs(advapi32 rpcrt4 kernel32 ntdll msvcrt)
 
-add_pch(advapi32 advapi32.h)
+add_pch(advapi32 advapi32.h
+    ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.h
+    ${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_c.h)
 add_cd_file(TARGET advapi32 DESTINATION reactos/system32 FOR all)
 add_importlib_target(advapi32.spec)