[CMAKE]

- rostests side of r53585

svn path=/trunk/; revision=53586

diff --git a/rostests/tests/pseh2/CMakeLists.txt b/rostests/tests/pseh2/CMakeLists.txt
index bf5ece1..5308020 100644 (file)
--- a/rostests/tests/pseh2/CMakeLists.txt
+++ b/rostests/tests/pseh2/CMakeLists.txt
@@ -6,3 +6,7 @@ target_link_libraries(pseh2_test wine ${PSEH_LIB})
 set_module_type(pseh2_test win32cui)
 add_importlibs(pseh2_test msvcrt kernel32 ntdll)
 add_cd_file(TARGET pseh2_test DESTINATION reactos/bin FOR all)
+
+if(NOT MSVC)
+    allow_warnings(pseh2_test)
+endif()

diff --git a/rostests/winetests/comctl32/CMakeLists.txt b/rostests/winetests/comctl32/CMakeLists.txt
index 78aa899..34f36a2 100644 (file)
--- a/rostests/winetests/comctl32/CMakeLists.txt
+++ b/rostests/winetests/comctl32/CMakeLists.txt
@@ -39,6 +39,8 @@ target_link_libraries(comctl32_winetest wine)
 
 if(MSVC)
     target_link_libraries(comctl32_winetest uuid)
+else()
+    allow_warnings(comctl32_winetest)
 endif()
 
 set_module_type(comctl32_winetest win32cui)

diff --git a/rostests/winetests/fusion/CMakeLists.txt b/rostests/winetests/fusion/CMakeLists.txt
index 7d0409d..e265d5b 100644 (file)
--- a/rostests/winetests/fusion/CMakeLists.txt
+++ b/rostests/winetests/fusion/CMakeLists.txt
@@ -15,3 +15,7 @@ target_link_libraries(fusion_winetest wine)
 set_module_type(fusion_winetest win32cui)
 add_importlibs(fusion_winetest user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET fusion_winetest DESTINATION reactos/bin FOR all)
+
+if(NOT MSVC)
+    allow_warnings(fusion_winetest)
+endif()

diff --git a/rostests/winetests/kernel32/CMakeLists.txt b/rostests/winetests/kernel32/CMakeLists.txt
index 30b0f22..b18c9f7 100644 (file)
--- a/rostests/winetests/kernel32/CMakeLists.txt
+++ b/rostests/winetests/kernel32/CMakeLists.txt
@@ -3,6 +3,8 @@ add_definitions(
     -D__ROS_LONG64__
     -D_DLL -D__USE_CRTIMP)
 
+remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
+
 set_rc_compiler()
 
 list(APPEND SOURCE
@@ -49,4 +51,6 @@ target_link_libraries(kernel32_winetest wine)
 set_module_type(kernel32_winetest win32cui)
 add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll)
 
+allow_warnings(kernel32_winetest)
+
 add_cd_file(TARGET kernel32_winetest DESTINATION reactos/bin FOR all)
\ No newline at end of file

diff --git a/rostests/winetests/msvcrt/CMakeLists.txt b/rostests/winetests/msvcrt/CMakeLists.txt
index f68840b..99163ad 100644 (file)
--- a/rostests/winetests/msvcrt/CMakeLists.txt
+++ b/rostests/winetests/msvcrt/CMakeLists.txt
@@ -24,6 +24,8 @@ add_executable(msvcrt_winetest ${SOURCE})
 
 if(MSVC)
     target_link_libraries(msvcrt_winetest oldnames)
+else()
+    allow_warnings(msvcrt_winetest)
 endif()
 
 set_module_type(msvcrt_winetest win32cui)

diff --git a/rostests/winetests/ntdll/CMakeLists.txt b/rostests/winetests/ntdll/CMakeLists.txt
index 68c56bd..0fe16a3 100644 (file)
--- a/rostests/winetests/ntdll/CMakeLists.txt
+++ b/rostests/winetests/ntdll/CMakeLists.txt
@@ -29,3 +29,6 @@ add_executable(ntdll_winetest ${SOURCE})
 set_module_type(ntdll_winetest win32cui)
 add_importlibs(ntdll_winetest user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET ntdll_winetest DESTINATION reactos/bin FOR all)
+if(NOT MSVC)
+    allow_warnings(ntdll_winetest)
+endif()

diff --git a/rostests/winetests/powrprof/CMakeLists.txt b/rostests/winetests/powrprof/CMakeLists.txt
index 1146223..3ae788b 100644 (file)
--- a/rostests/winetests/powrprof/CMakeLists.txt
+++ b/rostests/winetests/powrprof/CMakeLists.txt
@@ -8,3 +8,7 @@ add_executable(powrprof_winetest pwrprof.c testlist.c)
 set_module_type(powrprof_winetest win32cui)
 add_importlibs(powrprof_winetest advapi32 powrprof msvcrt kernel32 ntdll)
 add_cd_file(TARGET powrprof_winetest DESTINATION reactos/bin FOR all)
+
+if(NOT MSVC)
+    allow_warnings(powrprof_winetest)
+endif()

diff --git a/rostests/winetests/rpcrt4/CMakeLists.txt b/rostests/winetests/rpcrt4/CMakeLists.txt
index 75b418d..ad9383b 100644 (file)
--- a/rostests/winetests/rpcrt4/CMakeLists.txt
+++ b/rostests/winetests/rpcrt4/CMakeLists.txt
@@ -1,5 +1,6 @@
 
-remove_definitions(-D_WIN32_WINNT=0x502)
+remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
+
 add_definitions(-D_WIN32_WINNT=0x500)
 
 add_definitions(
@@ -44,3 +45,7 @@ target_link_libraries(rpcrt4_winetest
 set_module_type(rpcrt4_winetest win32cui)
 add_importlibs(rpcrt4_winetest ole32 rpcrt4 msvcrt kernel32 ntdll)
 add_cd_file(TARGET rpcrt4_winetest DESTINATION reactos/bin FOR all)
+
+if(NOT MSVC)
+    allow_warnings(rpcrt4_winetest)
+endif()

diff --git a/rostests/winetests/setupapi/CMakeLists.txt b/rostests/winetests/setupapi/CMakeLists.txt
index ab220dd..65a5bd9 100644 (file)
--- a/rostests/winetests/setupapi/CMakeLists.txt
+++ b/rostests/winetests/setupapi/CMakeLists.txt
@@ -19,3 +19,7 @@ target_link_libraries(setupapi_winetest wine)
 set_module_type(setupapi_winetest win32cui)
 add_importlibs(setupapi_winetest advapi32 setupapi user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET setupapi_winetest DESTINATION reactos/bin FOR all)
+
+if(NOT MSVC)
+    allow_warnings(setupapi_winetest)
+endif()

diff --git a/rostests/winetests/shdocvw/CMakeLists.txt b/rostests/winetests/shdocvw/CMakeLists.txt
index d4ec5be..5bf15d8 100644 (file)
--- a/rostests/winetests/shdocvw/CMakeLists.txt
+++ b/rostests/winetests/shdocvw/CMakeLists.txt
@@ -15,3 +15,7 @@ target_link_libraries(shdocvw_winetest wine uuid)
 set_module_type(shdocvw_winetest win32cui)
 add_importlibs(shdocvw_winetest gdi32 shell32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET shdocvw_winetest DESTINATION reactos/bin FOR all)
+
+if(NOT MSVC)
+    allow_warnings(shdocvw_winetest)
+endif()

diff --git a/rostests/winetests/user32/CMakeLists.txt b/rostests/winetests/user32/CMakeLists.txt
index c1a45e0..3c251c1 100644 (file)
--- a/rostests/winetests/user32/CMakeLists.txt
+++ b/rostests/winetests/user32/CMakeLists.txt
@@ -38,3 +38,7 @@ target_link_libraries(user32_winetest wine)
 set_module_type(user32_winetest win32cui)
 add_importlibs(user32_winetest user32 gdi32 advapi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET user32_winetest DESTINATION reactos/bin FOR all)
+
+if(NOT MSVC)
+    allow_warnings(user32_winetest)
+endif()
\ No newline at end of file

diff --git a/rostests/winetests/winmm/CMakeLists.txt b/rostests/winetests/winmm/CMakeLists.txt
index 4d24b9a..521c960 100644 (file)
--- a/rostests/winetests/winmm/CMakeLists.txt
+++ b/rostests/winetests/winmm/CMakeLists.txt
@@ -17,3 +17,7 @@ target_link_libraries(winmm_winetest wine dxguid)
 set_module_type(winmm_winetest win32cui)
 add_importlibs(winmm_winetest winmm user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET winmm_winetest DESTINATION reactos/bin FOR all)
+
+if(NOT MSVC)
+    allow_warnings(winmm_winetest)
+endif()

diff --git a/rostests/winetests/ws2_32/CMakeLists.txt b/rostests/winetests/ws2_32/CMakeLists.txt
index 1001f21..ec81361 100644 (file)
--- a/rostests/winetests/ws2_32/CMakeLists.txt
+++ b/rostests/winetests/ws2_32/CMakeLists.txt
@@ -8,3 +8,7 @@ target_link_libraries(ws2_32_winetest wine)
 set_module_type(ws2_32_winetest win32cui)
 add_importlibs(ws2_32_winetest ws2_32 user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET ws2_32_winetest DESTINATION reactos/bin FOR all)
+
+if(NOT MSVC)
+    allow_warnings(ws2_32_winetest)
+endif()