From 9b8dac57e5a1cd4789d6d46187583f8c60ab8b4e Mon Sep 17 00:00:00 2001 From: Puneet Kaushik Date: Fri, 31 May 2019 16:11:50 -0700 Subject: [PATCH] Remove CompilerSettingsUnix from Windows builds Summary: CompilerSettingsUnix adds /Wextra and other compiler flags which will error when building with Visual studio. Reviewed By: chadaustin Differential Revision: D15536742 fbshipit-source-id: af842f6ad50833f29fbfb602cdf793d0c4de11a9 --- CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 89c8f71453..88efd8eb81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,10 @@ +# Copyright (c) 2019-present, Facebook, Inc. +# All rights reserved. +# +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. An additional grant +# of patent rights can be found in the PATENTS file in the same directory. + cmake_minimum_required(VERSION 3.1.3 FATAL_ERROR) # We use the GoogleTest module if it is available (only in CMake 3.9+) # It requires CMP0054 and CMP0057 to be enabled. @@ -38,7 +45,10 @@ else() endif() set(CMAKE_CXX_STANDARD 17) -include(CompilerSettingsUnix) + +if (NOT WIN32) + include(CompilerSettingsUnix) +endif() include(EdenConfigChecks) include(ThriftCppLibrary) include(FBMercurialFeatures)