[CMAKE]

Add apitests and pseh2_test.

svn path=/trunk/; revision=50277

diff --git a/rostests/CMakeLists.txt b/rostests/CMakeLists.txt
index 91c76f3..4017864 100644 (file)
--- a/rostests/CMakeLists.txt
+++ b/rostests/CMakeLists.txt
@@ -4,6 +4,6 @@ add_subdirectory(apitests)
 #add_subdirectory(dxtest)
 #add_subdirectory(regtests)
 add_subdirectory(rosautotest)
-#add_subdirectory(tests)
+add_subdirectory(tests)
 #add_subdirectory(win32)
 add_subdirectory(winetests)

diff --git a/rostests/apitests/dciman32/CMakeLists.txt b/rostests/apitests/dciman32/CMakeLists.txt
index 552e51d..ce903a0 100644 (file)
--- a/rostests/apitests/dciman32/CMakeLists.txt
+++ b/rostests/apitests/dciman32/CMakeLists.txt
@@ -5,3 +5,4 @@ add_executable(dciman32_apitest DCICreatePrimary.c testlist.c)
 target_link_libraries(dciman32_apitest wine)
 set_module_type(dciman32_apitest win32cui)
 add_importlibs(dciman32_apitest msvcrt kernel32 ntdll)
+add_cab_target(dciman32_apitest 7)

diff --git a/rostests/apitests/gdi32/CMakeLists.txt b/rostests/apitests/gdi32/CMakeLists.txt
index 969eba3..fdc8680 100644 (file)
--- a/rostests/apitests/gdi32/CMakeLists.txt
+++ b/rostests/apitests/gdi32/CMakeLists.txt
@@ -47,3 +47,4 @@ add_executable(gdi32_apitest ${SOURCE})
 target_link_libraries(gdi32_apitest wine ${PSEH_LIB})
 set_module_type(gdi32_apitest win32cui)
 add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll)
+add_cab_target(gdi32_apitest 7)

diff --git a/rostests/apitests/ntdll/CMakeLists.txt b/rostests/apitests/ntdll/CMakeLists.txt
index 2b6d493..1e3de40 100644 (file)
--- a/rostests/apitests/ntdll/CMakeLists.txt
+++ b/rostests/apitests/ntdll/CMakeLists.txt
@@ -16,3 +16,4 @@ target_link_libraries(ntdll_apitest wine
  )
 set_module_type(ntdll_apitest win32cui)
 add_importlibs(ntdll_apitest ntdll)
+add_cab_target(ntdll_apitest 7)

diff --git a/rostests/apitests/user32/CMakeLists.txt b/rostests/apitests/user32/CMakeLists.txt
index 2ae9ea1..6a36d9a 100644 (file)
--- a/rostests/apitests/user32/CMakeLists.txt
+++ b/rostests/apitests/user32/CMakeLists.txt
@@ -13,3 +13,4 @@ add_executable(user32_apitest ${SOURCE})
 target_link_libraries(user32_apitest wine)
 set_module_type(user32_apitest win32cui)
 add_importlibs(user32_apitest gdi32 user32 msvcrt kernel32 ntdll)
+add_cab_target(user32_apitest 7)

diff --git a/rostests/apitests/ws2_32/CMakeLists.txt b/rostests/apitests/ws2_32/CMakeLists.txt
index ba9da9c..9247485 100644 (file)
--- a/rostests/apitests/ws2_32/CMakeLists.txt
+++ b/rostests/apitests/ws2_32/CMakeLists.txt
@@ -11,3 +11,4 @@ add_executable(ws2_32_apitest ${SOURCE})
 target_link_libraries(ws2_32_apitest wine)
 set_module_type(ws2_32_apitest win32cui)
 add_importlibs(ws2_32_apitest ws2_32 msvcrt kernel32 ntdll)
+add_cab_target(ws2_32_apitest 7)

diff --git a/rostests/tests/CMakeLists.txt b/rostests/tests/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a63de35
--- /dev/null
+++ b/rostests/tests/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(pseh2)

diff --git a/rostests/tests/pseh2/CMakeLists.txt b/rostests/tests/pseh2/CMakeLists.txt
new file mode 100644 (file)
index 0000000..2eb4f79
--- /dev/null
+++ b/rostests/tests/pseh2/CMakeLists.txt
@@ -0,0 +1,8 @@
+
+add_definitions(-D_DLL -D__USE_CRTIMP)
+
+add_executable(pseh2_test psehtest.c psehtest2.c)
+target_link_libraries(pseh2_test wine ${PSEH_LIB})
+set_module_type(pseh2_test win32cui)
+add_importlibs(pseh2_test msvcrt kernel32 ntdll)
+add_cab_target(pseh2_test 7)