Make a few adjustments to the compile config for the CMake build

Summary: This includes adding options to toggle `/std:c++latest`, and `WIN32_LEAN_AND_MEAN`, along with giving a nice drop-down selector to `MSVC_FAVORED_ARCHITECTURE` when configured via the GUI, dropping `_WINSOCK_DEPRECATED_NO_WARNINGS` as it wasn't needed, and re-enabling warnings 4365 and 4775 within the scope of the standard library.

Reviewed By: yfeldblum

Differential Revision: D5100586

fbshipit-source-id: 87b20c6415391d4f0c75837cad5bc312910bf49f

diff --git a/CMake/FollyCompiler.cmake b/CMake/FollyCompiler.cmake
index 29d2ca2e5ad951e6ac4ed688f50f08e4841d127b..31184ec983b5e50fa024f61f0f35d0230f2dfa4d 100755 (executable)
--- a/CMake/FollyCompiler.cmake
+++ b/CMake/FollyCompiler.cmake
@@ -1,7 +1,9 @@
 # Some additional configuration options.\r
 option(MSVC_ENABLE_ALL_WARNINGS "If enabled, pass /Wall to the compiler." ON)\r
+option(MSVC_ENABLE_CPP_LATEST "If enabled, pass /std:c++latest to the compiler" ON)\r
 option(MSVC_ENABLE_DEBUG_INLINING "If enabled, enable inlining in the debug configuration. This allows /Zc:inline to be far more effective." OFF)\r
 option(MSVC_ENABLE_FAST_LINK "If enabled, pass /DEBUG:FASTLINK to the linker. This makes linking faster, but the gtest integration for Visual Studio can't currently handle the .pdbs generated." OFF)\r
+option(MSVC_ENABLE_LEAN_AND_MEAN_WINDOWS "If enabled, define WIN32_LEAN_AND_MEAN to include a smaller subset of Windows.h" ON)\r
 option(MSVC_ENABLE_LTCG "If enabled, use Link Time Code Generation for Release builds." OFF)\r
 option(MSVC_ENABLE_PARALLEL_BUILD "If enabled, build multiple source files in parallel." ON)\r
 option(MSVC_ENABLE_STATIC_ANALYSIS "If enabled, do more complex static analysis and generate warnings appropriately." OFF)\r
@@ -9,6 +11,15 @@ option(MSVC_USE_STATIC_RUNTIME "If enabled, build against the static, rather tha
 \r
 # Alas, option() doesn't support string values.\r
 set(MSVC_FAVORED_ARCHITECTURE "blend" CACHE STRING "One of 'blend', 'AMD64', 'INTEL64', or 'ATOM'. This tells the compiler to generate code optimized to run best on the specified architecture.")\r
+# Add a pretty drop-down selector for these values when using the GUI.\r
+set_property(\r
+  CACHE MSVC_FAVORED_ARCHITECTURE\r
+  PROPERTY STRINGS\r
+    blend\r
+    AMD64\r
+    ATOM\r
+    INTEL64\r
+)\r
 # Validate, and then add the favored architecture.\r
 if (NOT MSVC_FAVORED_ARCHITECTURE STREQUAL "blend" AND NOT MSVC_FAVORED_ARCHITECTURE STREQUAL "AMD64" AND NOT MSVC_FAVORED_ARCHITECTURE STREQUAL "INTEL64" AND NOT MSVC_FAVORED_ARCHITECTURE STREQUAL "ATOM")\r
   message(FATAL_ERROR "MSVC_FAVORED_ARCHITECTURE must be set to one of exactly, 'blend', 'AMD64', 'INTEL64', or 'ATOM'! Got '${MSVC_FAVORED_ARCHITECTURE}' instead!")\r
@@ -46,7 +57,6 @@ function(apply_folly_compile_options_to_target THETARGET)
   # The general options passed:\r
   target_compile_options(${THETARGET}\r
     PUBLIC\r
-      #/std:c++latest # Build in C++17 mode\r
       /EHa # Enable both SEH and C++ Exceptions.\r
       /Zc:referenceBinding # Disallow temporaries from binding to non-const lvalue references.\r
       /Zc:rvalueCast # Enforce the standard rules for explicit type conversion.\r
@@ -55,6 +65,8 @@ function(apply_folly_compile_options_to_target THETARGET)
       /Zc:threadSafeInit # Enable thread-safe function-local statics initialization.\r
       /Zc:throwingNew # Assume operator new throws on failure.\r
 \r
+      $<$<BOOL:${MSVC_ENABLE_CPP_LATEST}>:/std:c++latest> # Build in C++ Latest mode if requested.\r
+\r
       # This is only supported by MSVC 2017\r
       $<$<BOOL:${MSVC_IS_2017}>:/permissive-> # Be mean, don't allow bad non-standard stuff (C++/CLI, __declspec, etc. are all left intact).\r
     PRIVATE\r
@@ -223,15 +235,15 @@ function(apply_folly_compile_options_to_target THETARGET)
   # And the extra defines:\r
   target_compile_definitions(${THETARGET}\r
     PUBLIC\r
-      _HAS_AUTO_PTR_ETC=1 # We're building in C++ 17 mode, but certain dependencies (Boost) still have dependencies on unary_function and binary_function, so we have to make sure not to remove them.\r
       NOMINMAX # This is needed because, for some absurd reason, one of the windows headers tries to define "min" and "max" as macros, which messes up most uses of std::numeric_limits.\r
       _CRT_NONSTDC_NO_WARNINGS # Don't deprecate posix names of functions.\r
       _CRT_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps.\r
       _SCL_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps.\r
-      _WINSOCK_DEPRECATED_NO_WARNINGS # Don't deprecate pieces of winsock\r
-      WIN32_LEAN_AND_MEAN # Don't include most of Windows.h\r
       \r
-      _STL_EXTRA_DISABLED_WARNINGS=4365\ 4774\ 4775\ 4987\r
+      _STL_EXTRA_DISABLED_WARNINGS=4774\ 4987\r
+\r
+      $<$<BOOL:${MSVC_ENABLE_CPP_LATEST}>:"_HAS_AUTO_PTR_ETC=1"> # We're building in C++ 17 or greater mode, but certain dependencies (Boost) still have dependencies on unary_function and binary_function, so we have to make sure not to remove them.\r
+      $<$<BOOL:${MSVC_ENABLE_LEAN_AND_MEAN_WINDOWS}>:"WIN32_LEAN_AND_MEAN"> # Don't include most of Windows.h\r
   )\r
 \r
   # Ignore a warning about an object file not defining any symbols,\r