From d2b625c52fe9c1cf3995cd4cd21dfbb7ae9e2d51 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 12 Mar 2012 13:34:01 +0000
Subject: [PATCH] [ROSTESTS] * Addendum to my previous commit.

svn path=/trunk/; revision=56131
---
 rostests/winetests/comctl32/CMakeLists.txt | 14 ++++++++------
 rostests/winetests/gdi32/CMakeLists.txt    | 15 ++++++++++-----
 rostests/winetests/kernel32/CMakeLists.txt | 17 ++++++++++-------
 rostests/winetests/user32/CMakeLists.txt   | 14 ++++++++------
 4 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/rostests/winetests/comctl32/CMakeLists.txt b/rostests/winetests/comctl32/CMakeLists.txt
index 72dd0a5bb13..dd2e53f85be 100644
--- a/rostests/winetests/comctl32/CMakeLists.txt
+++ b/rostests/winetests/comctl32/CMakeLists.txt
@@ -7,8 +7,6 @@ add_definitions(-D_WIN32_WINNT=0x600)
 remove_definitions(-D_WIN32_IE=0x600)
 add_definitions(-D_WIN32_IE=0x500)
 
-set_rc_compiler()
-
 list(APPEND SOURCE
     comboex.c
     datetime.c
@@ -31,17 +29,21 @@ list(APPEND SOURCE
     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)
diff --git a/rostests/winetests/gdi32/CMakeLists.txt b/rostests/winetests/gdi32/CMakeLists.txt
index abc96bc2181..725662fdfca 100644
--- a/rostests/winetests/gdi32/CMakeLists.txt
+++ b/rostests/winetests/gdi32/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-set_rc_compiler()
-
 add_definitions(
     -D__ROS_LONG64__
     -D_DLL -D__USE_CRTIMP)
@@ -22,11 +20,18 @@ list(APPEND SOURCE
     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)
diff --git a/rostests/winetests/kernel32/CMakeLists.txt b/rostests/winetests/kernel32/CMakeLists.txt
index ef98fc94b9c..8ada336c4eb 100644
--- a/rostests/winetests/kernel32/CMakeLists.txt
+++ b/rostests/winetests/kernel32/CMakeLists.txt
@@ -4,8 +4,6 @@ add_definitions(
 
 remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
 
-set_rc_compiler()
-
 list(APPEND SOURCE
     actctx.c
     alloc.c
@@ -42,16 +40,21 @@ list(APPEND SOURCE
     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)
\ No newline at end of file
+add_cd_file(TARGET kernel32_winetest DESTINATION reactos/bin FOR all)
diff --git a/rostests/winetests/user32/CMakeLists.txt b/rostests/winetests/user32/CMakeLists.txt
index 39879661456..d5871a1e332 100644
--- a/rostests/winetests/user32/CMakeLists.txt
+++ b/rostests/winetests/user32/CMakeLists.txt
@@ -2,8 +2,6 @@
 add_definitions(
     -D__ROS_LONG64__)
 
-set_rc_compiler()
-
 list(APPEND SOURCE
     broadcast.c
     class.c
@@ -29,15 +27,19 @@ list(APPEND SOURCE
     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()
\ No newline at end of file
+    # 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()