[WINETESTS/CMAKE]
authorThomas Faber <thomas.faber@reactos.org>
Sun, 2 Oct 2011 22:16:18 +0000 (22:16 +0000)
committerThomas Faber <thomas.faber@reactos.org>
Sun, 2 Oct 2011 22:16:18 +0000 (22:16 +0000)
- Disable those unhelpful format string warnings
- Remove some unnecessary defines

svn path=/trunk/; revision=53945

rostests/winetests/comctl32/CMakeLists.txt
rostests/winetests/kernel32/CMakeLists.txt
rostests/winetests/msvcrt/CMakeLists.txt
rostests/winetests/rpcrt4/CMakeLists.txt
rostests/winetests/setupapi/CMakeLists.txt
rostests/winetests/user32/CMakeLists.txt
rostests/winetests/winmm/CMakeLists.txt
rostests/winetests/ws2_32/CMakeLists.txt

index 34f36a2..72dd0a5 100644 (file)
@@ -40,6 +40,7 @@ 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)
 endif()
 
index 5a26ce1..ef98fc9 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
+    -D__ROS_LONG64__)
 
 remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
 
@@ -51,6 +50,7 @@ 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)
 endif()
 
index 99163ad..eedc741 100644 (file)
@@ -25,7 +25,7 @@ add_executable(msvcrt_winetest ${SOURCE})
 if(MSVC)
     target_link_libraries(msvcrt_winetest oldnames)
 else()
-    allow_warnings(msvcrt_winetest)
+    add_target_compile_flags(msvcrt_winetest "-Wno-format")
 endif()
 
 set_module_type(msvcrt_winetest win32cui)
index ad9383b..215dbec 100644 (file)
@@ -4,8 +4,7 @@ remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x500)
 
 add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
+    -D__ROS_LONG64__)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
     
@@ -47,5 +46,6 @@ add_importlibs(rpcrt4_winetest ole32 rpcrt4 msvcrt kernel32 ntdll)
 add_cd_file(TARGET rpcrt4_winetest DESTINATION reactos/bin FOR all)
 
 if(NOT MSVC)
+    add_target_compile_flags(rpcrt4_winetest "-Wno-format")
     allow_warnings(rpcrt4_winetest)
 endif()
index 65a5bd9..2f3ff6e 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
+    -D__ROS_LONG64__)
 
 list(APPEND SOURCE
     devclass.c
@@ -21,5 +20,5 @@ 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)
+    add_target_compile_flags(setupapi_winetest "-Wno-format")
 endif()
index 3c251c1..3987966 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
+    -D__ROS_LONG64__)
 
 set_rc_compiler()
 
@@ -40,5 +39,5 @@ 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)
+    add_target_compile_flags(user32_winetest "-Wno-format")
 endif()
\ No newline at end of file
index 521c960..837f067 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
+    -D__ROS_LONG64__)
 
 list(APPEND SOURCE
     capture.c
@@ -19,5 +18,5 @@ 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)
+    add_target_compile_flags(winmm_winetest "-Wno-format")
 endif()
index ec81361..54bf563 100644 (file)
@@ -1,7 +1,6 @@
 
 add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
+    -D__ROS_LONG64__)
 
 add_executable(ws2_32_winetest protocol.c sock.c testlist.c)
 target_link_libraries(ws2_32_winetest wine)
@@ -10,5 +9,6 @@ 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)
+    add_target_compile_flags(ws2_32_winetest "-Wno-format")
     allow_warnings(ws2_32_winetest)
 endif()