From 47a2a8069d5854af786f0202515ef3a08ab79f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sun, 7 Aug 2011 11:13:45 +0000 Subject: [PATCH] [CMAKE] - add the possibility to add dependencies to PCH. - Use it to fix advapi32 build svn path=/trunk/; revision=53116 --- reactos/cmake/gcc.cmake | 5 ++++- reactos/cmake/idl-support.cmake | 1 - reactos/dll/win32/advapi32/CMakeLists.txt | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/reactos/cmake/gcc.cmake b/reactos/cmake/gcc.cmake index d70d529bd14..2de4e281006 100644 --- a/reactos/cmake/gcc.cmake +++ b/reactos/cmake/gcc.cmake @@ -334,7 +334,10 @@ if(PCH) 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) diff --git a/reactos/cmake/idl-support.cmake b/reactos/cmake/idl-support.cmake index 483bded402f..c3c1cda1856 100644 --- a/reactos/cmake/idl-support.cmake +++ b/reactos/cmake/idl-support.cmake @@ -138,7 +138,6 @@ function(add_rpc_files __type) 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} diff --git a/reactos/dll/win32/advapi32/CMakeLists.txt b/reactos/dll/win32/advapi32/CMakeLists.txt index d6f82127ff4..cac9758d875 100644 --- a/reactos/dll/win32/advapi32/CMakeLists.txt +++ b/reactos/dll/win32/advapi32/CMakeLists.txt @@ -65,6 +65,8 @@ target_link_libraries(advapi32 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)