[ros-diffs] [akhaldi] 50120: [CMAKE] - Add the remaining winetests to build. We compile them all now.

Author: akhaldi
Date: Fri Dec 24 12:09:01 2010
New Revision: 50120

URL: http://svn.reactos.org/svn/reactos?rev=50120&view=rev
Log:
[CMAKE]
- Add the remaining winetests to build. We compile them all now.

Added:
    trunk/rostests/winetests/oleaut32/CMakeLists.txt   (with props)
    trunk/rostests/winetests/rpcrt4/CMakeLists.txt   (with props)
Modified:
    trunk/rostests/winetests/CMakeLists.txt

Modified: trunk/rostests/winetests/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?…
==============================================================================
--- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Fri Dec 24 12:09:01 2010
@@ -49,7 +49,7 @@
 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(rasapi32)
 add_subdirectory(riched20)
 add_subdirectory(riched32)
-#add_subdirectory(rpcrt4)
+add_subdirectory(rpcrt4)
 add_subdirectory(rsabase)
 add_subdirectory(rsaenh)
 add_subdirectory(schannel)

Added: trunk/rostests/winetests/oleaut32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/CMakeL…
==============================================================================
--- trunk/rostests/winetests/oleaut32/CMakeLists.txt (added)
+++ trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] Fri Dec 24 12:09:01
2010
@@ -1,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)

Propchange: trunk/rostests/winetests/oleaut32/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/rostests/winetests/rpcrt4/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis…
==============================================================================
--- trunk/rostests/winetests/rpcrt4/CMakeLists.txt (added)
+++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Fri Dec 24 12:09:01 2010
@@ -1,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)

Propchange: trunk/rostests/winetests/rpcrt4/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native