Author: sir_richard Date: Sun Jul 25 20:04:16 2010 New Revision: 48260
URL: http://svn.reactos.org/svn/reactos?rev=48260&view=rev Log: [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.
Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/include/psdk/CMakeLists.txt
Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?rev... ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sun Jul 25 20:04:16 2010 @@ -15,9 +15,13 @@ 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) @@ -35,6 +39,7 @@
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/reactos) include_directories(./include/reactos/libs)
+add_subdirectory(include/psdk) + add_subdirectory(lib)
endif()
Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMake... ============================================================================== --- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Sun Jul 25 20:04:16 2010 @@ -7,8 +7,8 @@
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(