MSVC CMake generation optimization

fmtlib · Apr 6, 2022 · 1285773 · 1285773
1 parent 22d31b3
commit 1285773
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 59 deletions.
diff --git a/support/cmake/cxx14.cmake b/support/cmake/cxx14.cmake
@@ -1,70 +1,72 @@
 # C++14 feature support detection
 
-include(CheckCXXSourceCompiles)
-include(CheckCXXCompilerFlag)
-
 if (NOT CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD 11)
 endif()
 message(STATUS "CXX_STANDARD: ${CMAKE_CXX_STANDARD}")
 
-if (CMAKE_CXX_STANDARD EQUAL 20)
-  check_cxx_compiler_flag(-std=c++20 has_std_20_flag)
-  check_cxx_compiler_flag(-std=c++2a has_std_2a_flag)
+if (NOT MSVC)
+  include(CheckCXXSourceCompiles)
+  include(CheckCXXCompilerFlag)
 
-  if (has_std_20_flag)
-    set(CXX_STANDARD_FLAG -std=c++20)
-  elseif (has_std_2a_flag)
-    set(CXX_STANDARD_FLAG -std=c++2a)
-  endif ()
-elseif (CMAKE_CXX_STANDARD EQUAL 17)
-  check_cxx_compiler_flag(-std=c++17 has_std_17_flag)
-  check_cxx_compiler_flag(-std=c++1z has_std_1z_flag)
+  if (CMAKE_CXX_STANDARD EQUAL 20)
+    check_cxx_compiler_flag(-std=c++20 has_std_20_flag)
+    check_cxx_compiler_flag(-std=c++2a has_std_2a_flag)
 
-  if (has_std_17_flag)
-    set(CXX_STANDARD_FLAG -std=c++17)
-  elseif (has_std_1z_flag)
-    set(CXX_STANDARD_FLAG -std=c++1z)
-  endif ()
-elseif (CMAKE_CXX_STANDARD EQUAL 14)
-  check_cxx_compiler_flag(-std=c++14 has_std_14_flag)
-  check_cxx_compiler_flag(-std=c++1y has_std_1y_flag)
+    if (has_std_20_flag)
+      set(CXX_STANDARD_FLAG -std=c++20)
+    elseif (has_std_2a_flag)
+      set(CXX_STANDARD_FLAG -std=c++2a)
+    endif ()
+  elseif (CMAKE_CXX_STANDARD EQUAL 17)
+    check_cxx_compiler_flag(-std=c++17 has_std_17_flag)
+    check_cxx_compiler_flag(-std=c++1z has_std_1z_flag)
 
-  if (has_std_14_flag)
-    set(CXX_STANDARD_FLAG -std=c++14)
-  elseif (has_std_1y_flag)
-    set(CXX_STANDARD_FLAG -std=c++1y)
-  endif ()
-elseif (CMAKE_CXX_STANDARD EQUAL 11)
-  check_cxx_compiler_flag(-std=c++11 has_std_11_flag)
-  check_cxx_compiler_flag(-std=c++0x has_std_0x_flag)
+    if (has_std_17_flag)
+      set(CXX_STANDARD_FLAG -std=c++17)
+    elseif (has_std_1z_flag)
+      set(CXX_STANDARD_FLAG -std=c++1z)
+    endif ()
+  elseif (CMAKE_CXX_STANDARD EQUAL 14)
+    check_cxx_compiler_flag(-std=c++14 has_std_14_flag)
+    check_cxx_compiler_flag(-std=c++1y has_std_1y_flag)
+
+    if (has_std_14_flag)
+      set(CXX_STANDARD_FLAG -std=c++14)
+    elseif (has_std_1y_flag)
+      set(CXX_STANDARD_FLAG -std=c++1y)
+    endif ()
+  elseif (CMAKE_CXX_STANDARD EQUAL 11)
+    check_cxx_compiler_flag(-std=c++11 has_std_11_flag)
+    check_cxx_compiler_flag(-std=c++0x has_std_0x_flag)
 
-  if (has_std_11_flag)
-    set(CXX_STANDARD_FLAG -std=c++11)
-  elseif (has_std_0x_flag)
-    set(CXX_STANDARD_FLAG -std=c++0x)
+    if (has_std_11_flag)
+      set(CXX_STANDARD_FLAG -std=c++11)
+    elseif (has_std_0x_flag)
+      set(CXX_STANDARD_FLAG -std=c++0x)
+    endif ()
   endif ()
-endif ()
 
-set(CMAKE_REQUIRED_FLAGS ${CXX_STANDARD_FLAG})
+  set(CMAKE_REQUIRED_FLAGS ${CXX_STANDARD_FLAG})
 
-# Check if user-defined literals are available
-check_cxx_source_compiles("
-  void operator\"\" _udl(long double);
-  int main() {}"
-  SUPPORTS_USER_DEFINED_LITERALS)
-if (NOT SUPPORTS_USER_DEFINED_LITERALS)
-  set (SUPPORTS_USER_DEFINED_LITERALS OFF)
-endif ()
+  # Check if user-defined literals are available
+  check_cxx_source_compiles("
+    void operator\"\" _udl(long double);
+    int main() {}"
+    SUPPORTS_USER_DEFINED_LITERALS)
+  if (NOT SUPPORTS_USER_DEFINED_LITERALS)
+    set (SUPPORTS_USER_DEFINED_LITERALS OFF)
+  endif ()
 
-# Check if <variant> is available
-set(CMAKE_REQUIRED_FLAGS -std=c++1z)
-check_cxx_source_compiles("
-  #include <variant>
-  int main() {}"
-  FMT_HAS_VARIANT)
-if (NOT FMT_HAS_VARIANT)
-  set (FMT_HAS_VARIANT OFF)
-endif ()
+  # Check if <variant> is available
+  set(CMAKE_REQUIRED_FLAGS -std=c++1z)
+  check_cxx_source_compiles("
+    #include <variant>
+    int main() {}"
+    FMT_HAS_VARIANT)
+  if (NOT FMT_HAS_VARIANT)
+    set (FMT_HAS_VARIANT OFF)
+  endif ()
 
-set(CMAKE_REQUIRED_FLAGS )
+  set(CMAKE_REQUIRED_FLAGS )
+endif ()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -137,7 +137,7 @@ message(STATUS "FMT_PEDANTIC: ${FMT_PEDANTIC}")
 if (FMT_PEDANTIC)
   # Test that the library can be compiled with exceptions disabled.
   # -fno-exception is broken in icc: https://github.com/fmtlib/fmt/issues/822.
-  if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+  if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT MSVC)
     check_cxx_compiler_flag(-fno-exceptions HAVE_FNO_EXCEPTIONS_FLAG)
   endif ()
   if (HAVE_FNO_EXCEPTIONS_FLAG)

diff --git a/test/gtest/CMakeLists.txt b/test/gtest/CMakeLists.txt
@@ -18,10 +18,12 @@ else ()
 endif ()
 
 # Workaround GTest bug https://github.com/google/googletest/issues/705.
-check_cxx_compiler_flag(
-  -fno-delete-null-pointer-checks HAVE_FNO_DELETE_NULL_POINTER_CHECKS)
-if (HAVE_FNO_DELETE_NULL_POINTER_CHECKS)
-  target_compile_options(gtest PUBLIC -fno-delete-null-pointer-checks)
+if (NOT MSVC)
+  check_cxx_compiler_flag(
+    -fno-delete-null-pointer-checks HAVE_FNO_DELETE_NULL_POINTER_CHECKS)
+  if (HAVE_FNO_DELETE_NULL_POINTER_CHECKS)
+    target_compile_options(gtest PUBLIC -fno-delete-null-pointer-checks)
+  endif ()
 endif ()
 
 if (MSVC)