https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eba00d1b5ed678c5557271...
commit eba00d1b5ed678c5557271649d7cb41dd4ee47f7 Author: Serge Gautherie reactos-git_serge_171003@gautherie.fr AuthorDate: Fri Oct 5 18:49:17 2018 +0200 Commit: Jérôme Gardou zefklop@users.noreply.github.com CommitDate: Wed May 12 12:50:48 2021 +0200
[CMAKE] winetests/: Move '/wd4334' to 3 sub-modules only
Addendum to 42d2d5e. --- modules/rostests/winetests/CMakeLists.txt | 2 +- modules/rostests/winetests/comctl32/CMakeLists.txt | 5 +++++ modules/rostests/winetests/gdi32/CMakeLists.txt | 5 +++++ modules/rostests/winetests/ntdll/CMakeLists.txt | 5 +++++ 4 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/modules/rostests/winetests/CMakeLists.txt b/modules/rostests/winetests/CMakeLists.txt index e7b69326de4..580e81e4b5c 100644 --- a/modules/rostests/winetests/CMakeLists.txt +++ b/modules/rostests/winetests/CMakeLists.txt @@ -11,7 +11,7 @@ if(MSVC) if(ARCH STREQUAL "amd64") add_compile_options( /wd4312 # C4312: 'type cast': conversion from 'unsigned int' to 'char *' of greater size - /wd4334) # C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) + ) endif() endif()
diff --git a/modules/rostests/winetests/comctl32/CMakeLists.txt b/modules/rostests/winetests/comctl32/CMakeLists.txt index 604e0509bba..9fa7c45621d 100644 --- a/modules/rostests/winetests/comctl32/CMakeLists.txt +++ b/modules/rostests/winetests/comctl32/CMakeLists.txt @@ -42,6 +42,11 @@ add_executable(comctl32_winetest ${PCH_SKIP_SOURCE} rsrc.rc)
+if(MSVC AND ARCH STREQUAL "amd64") + # warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) + target_compile_options(comctl32_winetest PRIVATE /wd4334) +endif() + target_compile_options(comctl32_winetest PRIVATE $<$<NOT:$<C_COMPILER_ID:MSVC>>:-Wno-format>)
set_module_type(comctl32_winetest win32cui) diff --git a/modules/rostests/winetests/gdi32/CMakeLists.txt b/modules/rostests/winetests/gdi32/CMakeLists.txt index 89317137c9f..bd8ec4419d5 100644 --- a/modules/rostests/winetests/gdi32/CMakeLists.txt +++ b/modules/rostests/winetests/gdi32/CMakeLists.txt @@ -25,6 +25,11 @@ add_executable(gdi32_winetest ${PCH_SKIP_SOURCE} resource.rc)
+if(MSVC AND ARCH STREQUAL "amd64") + # warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) + target_compile_options(gdi32_winetest PRIVATE /wd4334) +endif() + set_module_type(gdi32_winetest win32cui) add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32)
diff --git a/modules/rostests/winetests/ntdll/CMakeLists.txt b/modules/rostests/winetests/ntdll/CMakeLists.txt index 33863166474..f7b435eee5a 100644 --- a/modules/rostests/winetests/ntdll/CMakeLists.txt +++ b/modules/rostests/winetests/ntdll/CMakeLists.txt @@ -38,6 +38,11 @@ add_executable(ntdll_winetest
target_link_libraries(ntdll_winetest pseh)
+if(MSVC AND ARCH STREQUAL "amd64") + # warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) + target_compile_options(ntdll_winetest PRIVATE /wd4334) +endif() + if(USE_CLANG_CL OR (NOT MSVC)) target_compile_options(ntdll_winetest PRIVATE "-Wno-format") endif()