From 10d2ada17d1a552b032b51b432139d52700dbbe1 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 15 Aug 2019 06:48:33 -0700 Subject: [PATCH] Fix Z7_MSVC_OVERRIDE for C source files (#24389) Summary: Fixes https://github.com/pytorch/pytorch/issues/24145#issuecomment-521507234 Pull Request resolved: https://github.com/pytorch/pytorch/pull/24389 Differential Revision: D16828222 Pulled By: ezyang fbshipit-source-id: dcf652fbd8b8945c71993e9b99394e18ac542e6b --- CMakeLists.txt | 2 ++ cmake/Dependencies.cmake | 2 ++ cmake/ProtoBuf.cmake | 2 ++ 3 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 745de73bd7c..4df0a8b375b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,6 +188,8 @@ if (MSVC) string(APPEND CMAKE_CXX_FLAGS " /EHa") if(MSVC_Z7_OVERRIDE) foreach(flag_var + CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE + CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) if(${flag_var} MATCHES "/Z[iI]") diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 7cae7d0ed36..4d35caf5df0 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -48,6 +48,8 @@ endif() if (MSVC) if(MSVC_Z7_OVERRIDE) foreach(flag_var + CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE + CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) if(${flag_var} MATCHES "/Z[iI]") diff --git a/cmake/ProtoBuf.cmake b/cmake/ProtoBuf.cmake index d4e6b0a0f9e..5629f033442 100644 --- a/cmake/ProtoBuf.cmake +++ b/cmake/ProtoBuf.cmake @@ -41,6 +41,8 @@ macro(custom_protobuf_find) if (MSVC) if(MSVC_Z7_OVERRIDE) foreach(flag_var + CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE + CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) if(${flag_var} MATCHES "/Z[iI]")