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

diff --git a/CMake/FollyCompiler.cmake b/CMake/FollyCompiler.cmake
index 70dfe378674771683bfc3af03fac6a476f13bafb..3c8093755c75c18bdcb3d2d301f777b4420eef40 100755 (executable)
--- 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\r
       /wd4587 # behavior change; constructor no longer implicitly called\r
       /wd4592 # symbol will be dynamically initialized (implementation limitation)\r
+      /wd4628 # digraphs not supported with -Ze\r
       /wd4723 # potential divide by 0\r
       /wd4724 # potential mod by 0\r
       /wd4868 # compiler may not enforce left-to-right evaluation order\r

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d390f06183f75e9a1b80b669a7844ecfb837388f..518e3df6200dc5e9279b1cd468252b4f3d7b8e4b 100755 (executable)
--- 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")