From b2ab6100e783db81e5ad77f7b6b6ce5efecd513a Mon Sep 17 00:00:00 2001 From: Sir Richard Date: Sun, 25 Jul 2010 19:27:03 +0000 Subject: [PATCH] [CMAKE]: Ignore "build" directory. [CMAKE]: Fix build. [CMAKE]: Generate headers outside the source tree, into intermediate directories. svn path=/branches/cmake-bringup/; revision=48259 --- CMakeLists.txt | 1 + include/psdk/CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e946d3e6a7..3e017f53378 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ add_definitions(-DTARGET_i386) include_directories(${REACTOS_SOURCE_DIR}/tools/unicode) include_directories(./include) +include_directories(./include/reactos) include_directories(./include/reactos/wine) add_subdirectory(tools) diff --git a/include/psdk/CMakeLists.txt b/include/psdk/CMakeLists.txt index 29c93627cc9..f609c13a707 100644 --- a/include/psdk/CMakeLists.txt +++ b/include/psdk/CMakeLists.txt @@ -6,18 +6,18 @@ MACRO (MACRO_ADD_INTERFACES) GET_FILENAME_COMPONENT(FILE ${_in_FILE} NAME_WE) ADD_CUSTOM_COMMAND( - OUTPUT ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.h - COMMAND widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -h -H ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.h ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.idl + OUTPUT ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h + COMMAND widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -h -H ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.idl DEPENDS widl ) SET_SOURCE_FILES_PROPERTIES( - ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.h + ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h PROPERTIES GENERATED TRUE ) - ADD_CUSTOM_TARGET(build_${FILE}_idl ALL DEPENDS ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.h) + ADD_CUSTOM_TARGET(build_${FILE}_idl ALL DEPENDS ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h) ENDFOREACH(_in_FILE ${ARGN})