CMake modernization/cleanup

wravery · wravery · commit 733e1008eec2 · 2021-12-03T09:01:53.000-08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,13 +1,10 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
-if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.15")
-  # Enable CMAKE_MSVC_RUNTIME_LIBRARY on Windows.
-  set(MSVC_MATCH_VCPKG_TRIPLET ON)
-  cmake_policy(SET CMP0091 NEW)
-endif()
+# Enable CMAKE_MSVC_RUNTIME_LIBRARY on Windows: https://cmake.org/cmake/help/latest/policy/CMP0091.html
+cmake_policy(SET CMP0091 NEW)
 
 # Default to the last updated version from version.txt.
 file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.txt" VERSION_FILE)
@@ -43,7 +40,7 @@ option(BUILD_SHARED_LIBS "Build shared libraries instead of static libs" OFF)
 if(VCPKG_TARGET_TRIPLET)
   message(STATUS "Using ${VCPKG_TARGET_TRIPLET} triplet with vcpkg")
 
-  if(MSVC AND MSVC_MATCH_VCPKG_TRIPLET)
+  if(MSVC)
     # Match the MSVC runtime if we're using VCPKG with static libraries.
     if(VCPKG_TARGET_TRIPLET MATCHES [[^.+-static$]])
       set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 # Enable version checks in find_package
 include(CMakePackageConfigHelpers)
diff --git a/cmake/cppgraphqlgen-update-client-files.cmake b/cmake/cppgraphqlgen-update-client-files.cmake
@@ -41,8 +41,10 @@ if(NOT FILE_NAMES)
   message(FATAL_ERROR "Schema generation failed!")
 endif()
 
-# Remove stale files in the source directory
+ # Support if() IN_LIST operator: https://cmake.org/cmake/help/latest/policy/CMP0057.html
 cmake_policy(SET CMP0057 NEW)
+
+# Remove stale files in the source directory
 file(GLOB OLD_FILES ${CLIENT_SOURCE_DIR}/*.h ${CLIENT_SOURCE_DIR}/*.cpp)
 foreach(OLD_FILE ${OLD_FILES})
   get_filename_component(OLD_FILE ${OLD_FILE} NAME)
diff --git a/cmake/cppgraphqlgen-update-schema-files.cmake b/cmake/cppgraphqlgen-update-schema-files.cmake
@@ -40,8 +40,10 @@ if(NOT FILE_NAMES)
   message(FATAL_ERROR "Schema generation failed!")
 endif()
 
-# Remove stale files in the source directory
+ # Support if() IN_LIST operator: https://cmake.org/cmake/help/latest/policy/CMP0057.html
 cmake_policy(SET CMP0057 NEW)
+
+# Remove stale files in the source directory
 file(GLOB OLD_FILES ${SCHEMA_SOURCE_DIR}/*.h ${SCHEMA_SOURCE_DIR}/*.cpp)
 foreach(OLD_FILE ${OLD_FILES})
   get_filename_component(OLD_FILE ${OLD_FILE} NAME)
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 add_subdirectory(client)
 add_subdirectory(learn)
diff --git a/samples/client/CMakeLists.txt b/samples/client/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 add_subdirectory(query)
 add_subdirectory(mutate)
diff --git a/samples/client/benchmark/CMakeLists.txt b/samples/client/benchmark/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 # Normally this would be handled by find_package(cppgraphqlgen CONFIG).
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/cppgraphqlgen-functions.cmake)
diff --git a/samples/client/mutate/CMakeLists.txt b/samples/client/mutate/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 # Normally this would be handled by find_package(cppgraphqlgen CONFIG).
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/cppgraphqlgen-functions.cmake)
diff --git a/samples/client/query/CMakeLists.txt b/samples/client/query/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 # Normally this would be handled by find_package(cppgraphqlgen CONFIG).
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/cppgraphqlgen-functions.cmake)
diff --git a/samples/client/subscribe/CMakeLists.txt b/samples/client/subscribe/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 # Normally this would be handled by find_package(cppgraphqlgen CONFIG).
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/cppgraphqlgen-functions.cmake)
diff --git a/samples/learn/CMakeLists.txt b/samples/learn/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 add_subdirectory(schema)
 add_library(star_wars STATIC
diff --git a/samples/learn/schema/CMakeLists.txt b/samples/learn/schema/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 # Normally this would be handled by find_package(cppgraphqlgen CONFIG).
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/cppgraphqlgen-functions.cmake)
diff --git a/samples/today/CMakeLists.txt b/samples/today/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 # separategraphql
 add_subdirectory(separate)
diff --git a/samples/today/separate/CMakeLists.txt b/samples/today/separate/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 # Normally this would be handled by find_package(cppgraphqlgen CONFIG).
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/cppgraphqlgen-functions.cmake)
diff --git a/samples/today/separate_nointrospection/CMakeLists.txt b/samples/today/separate_nointrospection/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 # Normally this would be handled by find_package(cppgraphqlgen CONFIG).
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/cppgraphqlgen-functions.cmake)
diff --git a/samples/today/unified/CMakeLists.txt b/samples/today/unified/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 # Normally this would be handled by find_package(cppgraphqlgen CONFIG).
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/cppgraphqlgen-functions.cmake)
diff --git a/samples/today/unified_nointrospection/CMakeLists.txt b/samples/today/unified_nointrospection/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 # Normally this would be handled by find_package(cppgraphqlgen CONFIG).
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/cppgraphqlgen-functions.cmake)
diff --git a/samples/validation/CMakeLists.txt b/samples/validation/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 if(GRAPHQL_BUILD_TESTS)
   add_subdirectory(schema)
diff --git a/samples/validation/schema/CMakeLists.txt b/samples/validation/schema/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 # Normally this would be handled by find_package(cppgraphqlgen CONFIG).
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/cppgraphqlgen-functions.cmake)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 if(GRAPHQL_UPDATE_VERSION)
   # internal/Version.h
@@ -74,7 +74,7 @@ function(check_coroutine_impl COROUTINE_HEADER COROUTINE_NAMESPACE OPTIONAL_FLAG
     CXX_STANDARD 20)
 
   if(NOT TEST_RESULT)
-      # Retry with each of the optional libraries.
+      # Retry with each of the optional flags.
       foreach(OPTIONAL_FLAG IN LISTS OPTIONAL_FLAGS)
         try_compile(TEST_RESULT
           ${CMAKE_CURRENT_BINARY_DIR}
@@ -347,9 +347,9 @@ add_library(graphqlservice
   Validation.cpp)
 add_library(cppgraphqlgen::graphqlservice ALIAS graphqlservice)
 target_link_libraries(graphqlservice PUBLIC
-    graphqlpeg
-    graphqlresponse
-    Threads::Threads)
+  graphqlpeg
+  graphqlresponse
+  Threads::Threads)
 
 if(GRAPHQL_UPDATE_SAMPLES)
   # Even though this target doesn't build IntrospectionSchema.cpp, it still
@@ -396,8 +396,8 @@ endif()
 add_library(graphqlclient GraphQLClient.cpp)
 add_library(cppgraphqlgen::graphqlclient ALIAS graphqlclient)
 target_link_libraries(graphqlclient PUBLIC
-    graphqlpeg
-    graphqlresponse)
+  graphqlpeg
+  graphqlresponse)
 
 if(GRAPHQL_UPDATE_VERSION)
   update_version_rc(graphqlclient)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-cmake_minimum_required(VERSION 3.8.2)
+cmake_minimum_required(VERSION 3.15)
 
 find_package(GTest MODULE REQUIRED)
 
