From 21e85af2c838fc1420a77d1ce2199c01858c18b0 Mon Sep 17 00:00:00 2001 From: Christopher Dykes Date: Fri, 10 Nov 2017 12:28:17 -0800 Subject: [PATCH] Minor tweaks to the wording of a couple of errors in the CMake build Summary: Tweak the wording of a couple error messages to make them clearer. Also disable the 'digraphs not supported' warning, as none of our supported compilers actually interpret digraphs in any of our supported build configurations. Closes: https://github.com/facebook/folly/issues/706 Reviewed By: yfeldblum Differential Revision: D6299715 fbshipit-source-id: 7c847ac859e082aea711f6751f626b4b43886da4 --- CMake/FollyCompiler.cmake | 1 + CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMake/FollyCompiler.cmake b/CMake/FollyCompiler.cmake index 70dfe378..3c809375 100755 --- a/CMake/FollyCompiler.cmake +++ b/CMake/FollyCompiler.cmake @@ -121,6 +121,7 @@ function(apply_folly_compile_options_to_target THETARGET) /wd4366 # result of unary '&' operator may be unaligned /wd4587 # behavior change; constructor no longer implicitly called /wd4592 # symbol will be dynamically initialized (implementation limitation) + /wd4628 # digraphs not supported with -Ze /wd4723 # potential divide by 0 /wd4724 # potential mod by 0 /wd4868 # compiler may not enforce left-to-right evaluation order diff --git a/CMakeLists.txt b/CMakeLists.txt index d390f061..518e3df6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,12 +24,12 @@ else() message(FATAL_ERROR "This build script only supports building Folly on 64-bit Windows with Visual Studio 2015 or Visual Studio 2017. MSVC version '${MSVC_VERSION}' is not supported.") endif() -# Check architecture OS +# Check target architecture if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8) - message(FATAL_ERROR "Folly requires a 64bit OS") + message(FATAL_ERROR "Folly requires a 64bit target architecture.") endif() if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") - message(FATAL_ERROR "You should only be using CMake to build Folly if you are on Windows!") + message(FATAL_ERROR "The CMake build should only be used on Windows. For every other platform, use the makefile.") endif() set(FOLLY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/folly") -- 2.34.1