[CMAKE]

Fix rostests after changing macros

svn path=/trunk/; revision=50481

diff --git a/rostests/winetests/oleaut32/CMakeLists.txt b/rostests/winetests/oleaut32/CMakeLists.txt
index 0a98dfe..08f703f 100644 (file)
--- a/rostests/winetests/oleaut32/CMakeLists.txt
+++ b/rostests/winetests/oleaut32/CMakeLists.txt
@@ -8,8 +8,8 @@ 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_interface_definitions(oleaut32_idlheaders test_reg.idl tmarshal.idl)
-add_idl_interface(tmarshal.idl)
+add_idl_Headers(oleaut32_idlheaders test_reg.idl tmarshal.idl)
+generate_idl_iids(tmarshal.idl)
 
 list(APPEND SOURCE
     dispatch.c

diff --git a/rostests/winetests/rpcrt4/CMakeLists.txt b/rostests/winetests/rpcrt4/CMakeLists.txt
index ffbfd7e..130190d 100644 (file)
--- a/rostests/winetests/rpcrt4/CMakeLists.txt
+++ b/rostests/winetests/rpcrt4/CMakeLists.txt
@@ -6,7 +6,7 @@ add_definitions(
     -D__ROS_LONG64__
     -D_DLL -D__USE_CRTIMP)
 
-idl_files(server.idl)
+add_rpc_library(serverrpc server.idl)
 
 list(APPEND SOURCE
     cstub.c
@@ -22,8 +22,7 @@ add_executable(rpcrt4_winetest ${SOURCE})
 target_link_libraries(rpcrt4_winetest
     uuid
     wine
-    server_server
-    server_client
+    serverrpc
     ${PSEH_LIB})
 
 set_module_type(rpcrt4_winetest win32cui)