block MASM : warning A4018 when building cryptopp in windows with ninja

PaddlePaddle · Dec 6, 2021 · 9e13a32 · 9e13a32 · paddle-bot-old · Dec 7, 2021
1 parent 7b1bb87
commit 9e13a32
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmake/external/cryptopp.cmake b/cmake/external/cryptopp.cmake
@@ -22,9 +22,9 @@ SET(CRYPTOPP_TAG        CRYPTOPP_8_2_0)
 
 IF(WIN32)
   SET(CRYPTOPP_LIBRARIES "${CRYPTOPP_INSTALL_DIR}/lib/cryptopp-static.lib" CACHE FILEPATH "cryptopp library." FORCE)
-  # There is a compilation parameter 'FI\"winapifamily.h\"' can't be used correctly
+  # There is a compilation parameter "/FI\"winapifamily.h\"" or "/FIwinapifamily.h" can't be used correctly
   # with Ninja on Windows. The only difference between the patch file and original
-  # file is that the compilation parameters are changed to 'FIwinapifamily.h'. This
+  # file is that the compilation parameters are changed to '/nologo'. This
   # patch command can be removed when upgrading to a higher version.
   if("${CMAKE_GENERATOR}" STREQUAL "Ninja")
     set(CRYPTOPP_PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PADDLE_SOURCE_DIR}/patches/cryptopp/CMakeLists.txt" "<SOURCE_DIR>/")

diff --git a/patches/cryptopp/CMakeLists.txt b/patches/cryptopp/CMakeLists.txt
@@ -447,7 +447,7 @@ if (MSVC)
   if (CMAKE_SYSTEM_VERSION MATCHES "10\\.0.*")
     list(APPEND CRYPTOPP_COMPILE_DEFINITIONS "_WIN32_WINNT=0x0A00")
   endif ()
-  list(APPEND CRYPTOPP_COMPILE_OPTIONS "/FIwinapifamily.h")
+  list(APPEND CRYPTOPP_COMPILE_OPTIONS "/nologo")
 endif ()
 
 # Enable PIC for all target machines except 32-bit i386 due to register pressures.