From c004b53d774472f577a381bf66ded3ccc9cbdaa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Fri, 16 Oct 2020 08:41:35 +0200 Subject: [PATCH] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Style fixes Co-authored-by: Hermès BÉLUSCA - MAÏTO Co-authored-by: Victor Perevertkin --- base/services/tftpd/CMakeLists.txt | 2 +- dll/3rdparty/libtiff/CMakeLists.txt | 2 +- dll/directx/wine/wined3d/CMakeLists.txt | 2 +- dll/win32/msxml3/CMakeLists.txt | 2 +- dll/win32/shell32/CMakeLists.txt | 2 +- modules/rosapps/applications/devutils/createspec/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/services/tftpd/CMakeLists.txt b/base/services/tftpd/CMakeLists.txt index 218464d28ae..fb6ab01c67d 100644 --- a/base/services/tftpd/CMakeLists.txt +++ b/base/services/tftpd/CMakeLists.txt @@ -4,6 +4,6 @@ set_module_type(tftpd win32cui) add_importlibs(tftpd advapi32 ws2_32 iphlpapi msvcrt kernel32) add_cd_file(TARGET tftpd DESTINATION reactos/system32 FOR all) -if ((NOT MSVC) OR USE_CLANG_CL) +if((NOT MSVC) OR USE_CLANG_CL) target_compile_options(tftpd PRIVATE -Wno-format-overflow) endif() diff --git a/dll/3rdparty/libtiff/CMakeLists.txt b/dll/3rdparty/libtiff/CMakeLists.txt index 470cbba14c8..fc98c11cac4 100644 --- a/dll/3rdparty/libtiff/CMakeLists.txt +++ b/dll/3rdparty/libtiff/CMakeLists.txt @@ -62,7 +62,7 @@ add_importlibs(libtiff user32 msvcrt kernel32 ntdll) add_pch(libtiff precomp.h SOURCE) add_cd_file(TARGET libtiff DESTINATION reactos/system32 FOR all) -if (MSVC) +if(MSVC) # error C4311: 'type cast': pointer truncation from 'thandle_t' to 'int' remove_target_compile_option(libtiff "/we4311") # error C4312: 'type cast': conversion from 'int' to 'thandle_t' of greater size diff --git a/dll/directx/wine/wined3d/CMakeLists.txt b/dll/directx/wine/wined3d/CMakeLists.txt index ea4f46059a6..3af303fd783 100644 --- a/dll/directx/wine/wined3d/CMakeLists.txt +++ b/dll/directx/wine/wined3d/CMakeLists.txt @@ -53,6 +53,6 @@ add_importlibs(d3dwine user32 opengl32 gdi32 advapi32 msvcrt kernel32 ntdll) add_pch(d3dwine precomp.h SOURCE) add_cd_file(TARGET d3dwine DESTINATION reactos/system32 FOR all) -if (NOT MSVC) +if(NOT MSVC) target_compile_options(d3dwine PRIVATE -Wno-format-overflow) endif() diff --git a/dll/win32/msxml3/CMakeLists.txt b/dll/win32/msxml3/CMakeLists.txt index 953b615d573..11fddb98a78 100644 --- a/dll/win32/msxml3/CMakeLists.txt +++ b/dll/win32/msxml3/CMakeLists.txt @@ -73,7 +73,7 @@ add_idl_headers(xmlparser_idlheader xmlparser.idl) set_module_type(msxml3 win32dll) target_link_libraries(msxml3 libxml2 iconv-static uuid wine zlib) -if (MSVC) +if(MSVC) target_compile_options(msxml3 PRIVATE /FIwine/typeof.h /FImsvc.h) endif() diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index 4525db49984..4ebe876caea 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -102,7 +102,7 @@ add_library(shell32 MODULE shell32.rc ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) -if (MSVC) +if(MSVC) # error C4311: 'type cast': pointer truncation from 'HANDLE' to 'INT' remove_target_compile_option(shell32 "/we4311") endif() diff --git a/modules/rosapps/applications/devutils/createspec/CMakeLists.txt b/modules/rosapps/applications/devutils/createspec/CMakeLists.txt index 1cb52624ccf..e008438e191 100644 --- a/modules/rosapps/applications/devutils/createspec/CMakeLists.txt +++ b/modules/rosapps/applications/devutils/createspec/CMakeLists.txt @@ -2,7 +2,7 @@ add_executable(createspec createspec.c) set_module_type(createspec win32cui) target_link_libraries(createspec wine) -if (NOT MSVC) +if(NOT MSVC) target_compile_options(createspec PRIVATE -Wno-stringop-overflow) endif() add_importlibs(createspec dbghelp msvcrt kernel32)