Commit 21e85af2 authored by Christopher Dykes's avatar Christopher Dykes Committed by Facebook Github Bot

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
parent ef20f638
...@@ -121,6 +121,7 @@ function(apply_folly_compile_options_to_target THETARGET) ...@@ -121,6 +121,7 @@ function(apply_folly_compile_options_to_target THETARGET)
/wd4366 # result of unary '&' operator may be unaligned /wd4366 # result of unary '&' operator may be unaligned
/wd4587 # behavior change; constructor no longer implicitly called /wd4587 # behavior change; constructor no longer implicitly called
/wd4592 # symbol will be dynamically initialized (implementation limitation) /wd4592 # symbol will be dynamically initialized (implementation limitation)
/wd4628 # digraphs not supported with -Ze
/wd4723 # potential divide by 0 /wd4723 # potential divide by 0
/wd4724 # potential mod by 0 /wd4724 # potential mod by 0
/wd4868 # compiler may not enforce left-to-right evaluation order /wd4868 # compiler may not enforce left-to-right evaluation order
......
...@@ -24,12 +24,12 @@ else() ...@@ -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.") 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() endif()
# Check architecture OS # Check target architecture
if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8) 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() endif()
if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") 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() endif()
set(FOLLY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/folly") set(FOLLY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/folly")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment