diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bc84e0..ea49a95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # This file is automatically generated from cmake.toml - DO NOT EDIT
 # See https://github.com/build-cpp/cmkr for more information
 
-cmake_minimum_required(VERSION 2.8...3.8)
+cmake_minimum_required(VERSION 2.8...3.31)
 
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
 	message(FATAL_ERROR "In-tree builds are not supported. Run CMake from a separate directory: cmake -B build")
diff --git a/cmake.toml b/cmake.toml
index 28d922c..f62fbbb 100644
--- a/cmake.toml
+++ b/cmake.toml
@@ -1,5 +1,5 @@
 [cmake]
-version = "2.8...3.8"
+version = "2.8...3.31"
 cmkr-include = false
 
 [project]
diff --git a/src/cmake_generator.cpp b/src/cmake_generator.cpp
index 808229e..8153038 100644
--- a/src/cmake_generator.cpp
+++ b/src/cmake_generator.cpp
@@ -943,15 +943,11 @@ void generate_cmake(const char *path, const parser::Project *parent_project) {
             cmd("endif")();
             cmd("message")("STATUS", "Fetching vcpkg (" + version_name + ")...");
             cmd("FetchContent_Declare")("vcpkg", vcpkg_args);
-            // Not using FetchContent_MakeAvailable here in case vcpkg adds CMakeLists.txt
-            cmd("FetchContent_GetProperties")("vcpkg");
-            cmd("if")("NOT", "vcpkg_POPULATED");
-                cmd("FetchContent_Populate")("vcpkg");
-                cmd("if")("CMAKE_HOST_SYSTEM_NAME", "STREQUAL", "Darwin", "AND", "CMAKE_OSX_ARCHITECTURES", "STREQUAL", RawArg("\"\""));
-                    cmd("set")("CMAKE_OSX_ARCHITECTURES", "${CMAKE_HOST_SYSTEM_PROCESSOR}", "CACHE", "STRING", RawArg("\"\""), "FORCE");
-                cmd("endif")();
-                cmd("include")("${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake");
+            cmd("FetchContent_MakeAvailable")("vcpkg").endl();
+            cmd("if")("CMAKE_HOST_SYSTEM_NAME", "STREQUAL", "Darwin", "AND", "CMAKE_OSX_ARCHITECTURES", "STREQUAL", RawArg("\"\""));
+                cmd("set")("CMAKE_OSX_ARCHITECTURES", "${CMAKE_HOST_SYSTEM_PROCESSOR}", "CACHE", "STRING", RawArg("\"\""), "FORCE");
             cmd("endif")();
+            cmd("include")("${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake");
         cmd("endif")();
         endl();
         // clang-format on