Author: akhaldi
Date: Thu Dec 30 17:55:25 2010
New Revision: 50225
URL:
http://svn.reactos.org/svn/reactos?rev=50225&view=rev
Log:
[CMAKE]
- Update oleaut32 winetest.
- Add rosautotest to build.
Added:
trunk/rostests/rosautotest/CMakeLists.txt (with props)
Modified:
trunk/rostests/CMakeLists.txt
trunk/rostests/winetests/oleaut32/CMakeLists.txt
Modified: trunk/rostests/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=50225&…
==============================================================================
--- trunk/rostests/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/CMakeLists.txt [iso-8859-1] Thu Dec 30 17:55:25 2010
@@ -3,7 +3,7 @@
#add_subdirectory(dibtests)
#add_subdirectory(dxtest)
#add_subdirectory(regtests)
-#add_subdirectory(rosautotest)
+add_subdirectory(rosautotest)
#add_subdirectory(tests)
#add_subdirectory(win32)
add_subdirectory(winetests)
Added: trunk/rostests/rosautotest/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.tx…
==============================================================================
--- trunk/rostests/rosautotest/CMakeLists.txt (added)
+++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Thu Dec 30 17:55:25 2010
@@ -1,0 +1,27 @@
+
+set_unicode()
+set_cpp()
+
+list(APPEND SOURCE
+ CConfiguration.cpp
+ CFatalException.cpp
+ CInvalidParameterException.cpp
+ CJournaledTestList.cpp
+ CProcess.cpp
+ CSimpleException.cpp
+ CTest.cpp
+ CTestInfo.cpp
+ CTestList.cpp
+ CVirtualTestList.cpp
+ CWebService.cpp
+ CWineTest.cpp
+ main.cpp
+ shutdown.cpp
+ tools.cpp)
+
+add_executable(rosautotest ${SOURCE})
+
+target_link_libraries(rosautotest wine)
+
+set_module_type(rosautotest win32cui)
+add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll)
Propchange: trunk/rostests/rosautotest/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/CMakeL…
==============================================================================
--- trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] Thu Dec 30 17:55:25
2010
@@ -5,10 +5,10 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-ADD_TYPELIB(oleaut32_typelibs test_reg.idl test_tlb.idl tmarshal.idl)
+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_interface_definitions(oleaut32_idlheaders test_reg.idl tmarshal.idl)
add_idl_interface(tmarshal.idl)
list(APPEND SOURCE