From 91f7232df76152b71d18e73c42dae2ecec1924be Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 24 Dec 2010 12:09:01 +0000 Subject: [PATCH] [CMAKE] - Add the remaining winetests to build. We compile them all now. svn path=/trunk/; revision=50120 --- rostests/winetests/CMakeLists.txt | 4 +-- rostests/winetests/oleaut32/CMakeLists.txt | 33 ++++++++++++++++++++++ rostests/winetests/rpcrt4/CMakeLists.txt | 30 ++++++++++++++++++++ 3 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 rostests/winetests/oleaut32/CMakeLists.txt create mode 100644 rostests/winetests/rpcrt4/CMakeLists.txt diff --git a/rostests/winetests/CMakeLists.txt b/rostests/winetests/CMakeLists.txt index 0ae0e8d6503..195194d96f6 100644 --- a/rostests/winetests/CMakeLists.txt +++ b/rostests/winetests/CMakeLists.txt @@ -49,7 +49,7 @@ add_subdirectory(ntprint) add_subdirectory(odbccp32) add_subdirectory(ole32) add_subdirectory(oleacc) -#add_subdirectory(oleaut32) +add_subdirectory(oleaut32) add_subdirectory(opengl32) add_subdirectory(pdh) add_subdirectory(powrprof) @@ -59,7 +59,7 @@ add_subdirectory(quartz) add_subdirectory(rasapi32) add_subdirectory(riched20) add_subdirectory(riched32) -#add_subdirectory(rpcrt4) +add_subdirectory(rpcrt4) add_subdirectory(rsabase) add_subdirectory(rsaenh) add_subdirectory(schannel) diff --git a/rostests/winetests/oleaut32/CMakeLists.txt b/rostests/winetests/oleaut32/CMakeLists.txt new file mode 100644 index 00000000000..8174f11ef98 --- /dev/null +++ b/rostests/winetests/oleaut32/CMakeLists.txt @@ -0,0 +1,33 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +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) + +list(APPEND SOURCE + dispatch.c + olefont.c + olepicture.c + safearray.c + testlist.c + tmarshal.c + tmarshal.rc + typelib.c + usrmarshal.c + varformat.c + vartest.c + vartype.c + ${CMAKE_CURRENT_BINARY_DIR}/tmarshal_i.c) + +add_executable(oleaut32_winetest ${SOURCE}) +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) diff --git a/rostests/winetests/rpcrt4/CMakeLists.txt b/rostests/winetests/rpcrt4/CMakeLists.txt new file mode 100644 index 00000000000..b8f7a1640fe --- /dev/null +++ b/rostests/winetests/rpcrt4/CMakeLists.txt @@ -0,0 +1,30 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x500) + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +MACRO_IDL_FILES(server.idl) + +list(APPEND SOURCE + cstub.c + generated.c + ndr_marshall.c + rpc.c + rpc_async.c + rpc_protseq.c + server.c + testlist.c) + +add_executable(rpcrt4_winetest ${SOURCE}) +target_link_libraries(rpcrt4_winetest + uuid + wine + server_server + server_client + ${PSEH_LIB}) + +set_module_type(rpcrt4_winetest win32cui) +add_importlibs(rpcrt4_winetest ole32 rpcrt4 msvcrt kernel32 ntdll) -- 2.17.1