Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 07:56:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ROSTESTS]

Browse source 
Fix oleaut32_winetest cmake build.

svn path=/trunk/; revision=54815
This commit is contained in:
Sylvain Petreolle 2012-01-03 11:38:21 +00:00
parent 73a5efbb25
commit 362af7d9dc
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rostests/winetests/oleaut32/CMakeLists.txt
View file

@ -5,8 +5,7 @@ add_definitions(
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
add_typelib(oleaut32_typelibs test_reg.idl test_tlb.idl tmarshal.idl) add_typelib(test_reg.idl test_tlb.idl tmarshal.idl)
add_dependencies(oleaut32_typelibs stdole2)
add_idl_Headers(oleaut32_idlheaders test_reg.idl tmarshal.idl) add_idl_Headers(oleaut32_idlheaders test_reg.idl tmarshal.idl)
generate_idl_iids(tmarshal.idl) generate_idl_iids(tmarshal.idl)
@ -30,5 +29,13 @@ add_executable(oleaut32_winetest ${SOURCE})
target_link_libraries(oleaut32_winetest uuid wine) target_link_libraries(oleaut32_winetest uuid wine)
set_module_type(oleaut32_winetest win32cui) set_module_type(oleaut32_winetest win32cui)
add_importlibs(oleaut32_winetest oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_importlibs(oleaut32_winetest oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
add_dependencies(oleaut32_winetest oleaut32_typelibs oleaut32_idlheaders) SET(tmarshal.rc_DEPS
${CMAKE_CURRENT_BINARY_DIR}/test_reg.tlb
${CMAKE_CURRENT_BINARY_DIR}/test_tlb.tlb
${CMAKE_CURRENT_BINARY_DIR}/tmarshal.tlb)
#doesn't work, only includes test_reg.tlb
#set_source_files_properties(tmarshal.rc PROPERTIES OBJECT_DEPENDS ${tmarshal.rc_DEPS})
add_custom_target(oleaut32_typelibs ALL DEPENDS ${tmarshal.rc_DEPS})
add_dependencies(oleaut32_winetest oleaut32_typelibs oleaut32_idlheaders stdole2)
add_cd_file(TARGET oleaut32_winetest DESTINATION reactos/bin FOR all) add_cd_file(TARGET oleaut32_winetest DESTINATION reactos/bin FOR all)