[ros-diffs] [akhaldi] 56131: [ROSTESTS] * Addendum to my previous commit.

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Mon Mar 12 13:34:01 2012
New Revision: 56131

URL: http://svn.reactos.org/svn/reactos?rev=56131&view=rev
Log:
[ROSTESTS]
* Addendum to my previous commit.

Modified:
    trunk/rostests/winetests/comctl32/CMakeLists.txt
    trunk/rostests/winetests/gdi32/CMakeLists.txt
    trunk/rostests/winetests/kernel32/CMakeLists.txt
    trunk/rostests/winetests/user32/CMakeLists.txt

Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeLists.txt?rev=56131&r1=56130&r2=56131&view=diff
==============================================================================
--- trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] Mon Mar 12 13:34:01 2012
@@ -6,8 +6,6 @@
 
 remove_definitions(-D_WIN32_IE=0x600)
 add_definitions(-D_WIN32_IE=0x500)
-
-set_rc_compiler()
 
 list(APPEND SOURCE
     comboex.c
@@ -31,17 +29,21 @@
     trackbar.c
     treeview.c
     updown.c
-    testlist.c
+    testlist.c)
+
+add_executable(comctl32_winetest
+    ${SOURCE}
     rsrc.rc)
 
-add_executable(comctl32_winetest ${SOURCE})
 target_link_libraries(comctl32_winetest wine)
 
 if(MSVC)
     target_link_libraries(comctl32_winetest uuid)
 else()
-    add_target_compile_flags(comctl32_winetest "-Wno-format")
-    allow_warnings(comctl32_winetest)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #add_target_compile_flags(comctl32_winetest "-Wno-format")
+    #allow_warnings(comctl32_winetest)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-error")
 endif()
 
 set_module_type(comctl32_winetest win32cui)

Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/CMakeLists.txt?rev=56131&r1=56130&r2=56131&view=diff
==============================================================================
--- trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] Mon Mar 12 13:34:01 2012
@@ -1,5 +1,3 @@
-
-set_rc_compiler()
 
 add_definitions(
     -D__ROS_LONG64__
@@ -22,11 +20,18 @@
     palette.c
     path.c
     pen.c
-    testlist.c
+    testlist.c)
+
+add_executable(gdi32_winetest
+    ${SOURCE}
     resource.rc)
 
-add_executable(gdi32_winetest ${SOURCE})
-allow_warnings(gdi32_winetest)
+if(NOT MSVC)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #allow_warnings(gdi32_winetest)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error")
+endif()
+
 set_module_type(gdi32_winetest win32cui)
 add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET gdi32_winetest DESTINATION reactos/bin FOR all)

Modified: trunk/rostests/winetests/kernel32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/CMakeLists.txt?rev=56131&r1=56130&r2=56131&view=diff
==============================================================================
--- trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] Mon Mar 12 13:34:01 2012
@@ -3,8 +3,6 @@
     -D__ROS_LONG64__)
 
 remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
-
-set_rc_compiler()
 
 list(APPEND SOURCE
     actctx.c
@@ -42,16 +40,21 @@
     virtual.c
     volume.c
     dosdev.c
-    testlist.c
+    testlist.c)
+
+add_executable(kernel32_winetest
+    ${SOURCE}
     resource.rc)
 
-add_executable(kernel32_winetest ${SOURCE})
 target_link_libraries(kernel32_winetest wine)
 set_module_type(kernel32_winetest win32cui)
 add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll)
+
 if(NOT MSVC)
-    add_target_compile_flags(kernel32_winetest "-Wno-format")
-    allow_warnings(kernel32_winetest)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #add_target_compile_flags(kernel32_winetest "-Wno-format")
+    #allow_warnings(kernel32_winetest)
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-error")
 endif()
 
-add_cd_file(TARGET kernel32_winetest DESTINATION reactos/bin FOR all)
+add_cd_file(TARGET kernel32_winetest DESTINATION reactos/bin FOR all)

Modified: trunk/rostests/winetests/user32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/CMakeLists.txt?rev=56131&r1=56130&r2=56131&view=diff
==============================================================================
--- trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] Mon Mar 12 13:34:01 2012
@@ -1,8 +1,6 @@
 
 add_definitions(
     -D__ROS_LONG64__)
-
-set_rc_compiler()
 
 list(APPEND SOURCE
     broadcast.c
@@ -29,15 +27,19 @@
     win.c
     winstation.c
     wsprintf.c
-    testlist.c
+    testlist.c)
+
+add_executable(user32_winetest
+    ${SOURCE}
     resource.rc)
 
-add_executable(user32_winetest ${SOURCE})
 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)
-    add_target_compile_flags(user32_winetest "-Wno-format")
-endif()
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #add_target_compile_flags(user32_winetest "-Wno-format")
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format")
+endif()