[ros-diffs] [spetreolle] 54815: [ROSTESTS] Fix oleaut32_winetest cmake build.

[spetreolle at svn.reactos.org]

Author: spetreolle
Date: Tue Jan  3 11:38:21 2012
New Revision: 54815

URL: http://svn.reactos.org/svn/reactos?rev=54815&view=rev
Log:
[ROSTESTS]
Fix oleaut32_winetest cmake build.

Modified:
    trunk/rostests/winetests/oleaut32/CMakeLists.txt

Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/CMakeLists.txt?rev=54815&r1=54814&r2=54815&view=diff
==============================================================================
--- trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] Tue Jan  3 11:38:21 2012
@@ -5,8 +5,7 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_typelib(oleaut32_typelibs test_reg.idl test_tlb.idl tmarshal.idl)
-add_dependencies(oleaut32_typelibs stdole2)
+add_typelib(test_reg.idl test_tlb.idl tmarshal.idl)
 
 add_idl_Headers(oleaut32_idlheaders test_reg.idl tmarshal.idl)
 generate_idl_iids(tmarshal.idl)
@@ -30,5 +29,13 @@
 target_link_libraries(oleaut32_winetest uuid wine)
 set_module_type(oleaut32_winetest win32cui)
 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)