Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 10:01:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[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.

Browse source 
[CMAKE]: Add generated headers to the include path.

svn path=/branches/cmake-bringup/; revision=48260
This commit is contained in:
Sir Richard 2010-07-25 20:04:16 +00:00
parent b2ab6100e7
commit b50bbda653
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -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()

4
include/psdk/CMakeLists.txt
View file

@ -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(