From 46ccacd7fa4135c5fb0d3dea8dacc3529b506728 Mon Sep 17 00:00:00 2001 From: Hugh Bellamy Date: Tue, 14 Feb 2017 09:20:50 +0700 Subject: [PATCH] Fix potentially appending "/wd4068" on mac builds --- cmake/modules/SwiftSharedCMakeConfig.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/modules/SwiftSharedCMakeConfig.cmake b/cmake/modules/SwiftSharedCMakeConfig.cmake index 43fcc5a847a..4c7a2e15510 100644 --- a/cmake/modules/SwiftSharedCMakeConfig.cmake +++ b/cmake/modules/SwiftSharedCMakeConfig.cmake @@ -289,8 +289,9 @@ macro(swift_common_cxx_warnings) # Disable C4068: unknown pragma. This means that MSVC doesn't report hundreds of warnings across # the repository for IDE features such as #pragma mark "Title". - check_cxx_compiler_flag("/wd4068" CXX_SUPPORTS_UNKNOWN_PRAGMA_FLAG) - append_if(CXX_SUPPORTS_UNKNOWN_PRAGMA_FLAG "/wd4068" CMAKE_CXX_FLAGS) + if("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4068") + endif() endmacro() # Like 'llvm_config()', but uses libraries from the selected build