From: Sir Richard <sir_richard@svn.reactos.org>
Date: Sun, 25 Jul 2010 20:04:16 +0000 (+0000)
Subject: [CMAKE]: Use some CMAKE magic to have widl defined as a "host tool", and make the... 
X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~987
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=b50bbda6536380f1a7a8232e685b0e5ab8062aa0

[CMAKE]: Use some CMAKE magic to have widl defined as a "host tool", and make the cross build CMAKE import it (as native-widl). Cross-build CMAKE will then use "native-widl" to build the header/IDL files in the cross-output-directory, instead of the host-output-directory.
[CMAKE]: Add generated headers to the include path.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e017f53378..98b4ee497d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,10 +15,14 @@ include_directories(./include/reactos)
 include_directories(./include/reactos/wine)
 
 add_subdirectory(tools)
-add_subdirectory(include/psdk)
+
+export(TARGETS widl FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
 
 else()
 
+set(IMPORT_EXECUTABLES "${REACTOS_SOURCE_DIR}/build/ImportExecutables.cmake" CACHE FILEPATH "Host executables")
+include(${IMPORT_EXECUTABLES})
+
 add_definitions(-DDBG=1)
 add_definitions(-D_SEH_ENABLE_TRACE)
 add_definitions(-DKDBG=1)
@@ -35,6 +39,7 @@ add_definitions(-D_USE_32BIT_TIME_T)
 
 include_directories(./include)
 include_directories(./include/psdk)
+include_directories(${REACTOS_BINARY_DIR}/include/psdk)
 include_directories(./include/crt)
 include_directories(./include/crt/mingw32)
 include_directories(./include/ddk)
@@ -42,6 +47,8 @@ include_directories(./include/ndk)
 include_directories(./include/reactos)
 include_directories(./include/reactos/libs)
 
+add_subdirectory(include/psdk)
+
 add_subdirectory(lib)
 
 endif()
diff --git a/include/psdk/CMakeLists.txt b/include/psdk/CMakeLists.txt
index f609c13a707..3b9d85d1e87 100644
--- a/include/psdk/CMakeLists.txt
+++ b/include/psdk/CMakeLists.txt
@@ -7,8 +7,8 @@ MACRO (MACRO_ADD_INTERFACES)
 
    ADD_CUSTOM_COMMAND(
      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
+     COMMAND native-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 native-widl
    )
 
    SET_SOURCE_FILES_PROPERTIES(