update cmake version range, no download progress, set policy version for libs

moritz-h · moritz-h · commit 777fbc4279fe · 2025-08-17T14:39:31.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.28...4.1 FATAL_ERROR)
 
 # Disable in source build
 set(CMAKE_DISABLE_SOURCE_CHANGES ON)
diff --git a/cmake/build_info_script.cmake b/cmake/build_info_script.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.28...4.1 FATAL_ERROR)
 
 # Directories
 get_filename_component(cmake_modules_dir ${CMAKE_SCRIPT_MODE_FILE} DIRECTORY)
diff --git a/cmake/deps/cmakerc.cmake b/cmake/deps/cmakerc.cmake
@@ -4,6 +4,7 @@ include_guard(GLOBAL)
 FetchContent_Declare(cmrc
   URL "https://github.com/vector-of-bool/cmrc/archive/952ffddba731fc110bd50409e8d2b8a06abbd237.tar.gz"
   URL_HASH SHA256=9a1e00d18da46d9765ba5a59f7275dea8b87b242b8885588b3a4694bd4d19747
+  DOWNLOAD_NO_PROGRESS ON
   SOURCE_SUBDIR non-existing-path-to-prevent-add-subdirectory
   EXCLUDE_FROM_ALL
   SYSTEM)
diff --git a/cmake/deps/freetype.cmake b/cmake/deps/freetype.cmake
@@ -4,6 +4,7 @@ include_guard(GLOBAL)
 FetchContent_Declare(freetype
   URL "https://github.com/freetype/freetype/archive/VER-2-13-3.tar.gz"
   URL_HASH SHA256=bc5c898e4756d373e0d991bab053036c5eb2aa7c0d5c67e8662ddc6da40c4103
+  DOWNLOAD_NO_PROGRESS ON
   EXCLUDE_FROM_ALL
   SYSTEM)
 message(STATUS "Fetch freetype ...")
@@ -13,6 +14,7 @@ option(FT_DISABLE_PNG "" ON)
 option(FT_DISABLE_HARFBUZZ "" ON)
 option(FT_DISABLE_BROTLI "" ON)
 set(SKIP_INSTALL_ALL TRUE)
+SET(CMAKE_POLICY_VERSION_MINIMUM 3.10) # Remove with next version
 FetchContent_MakeAvailable(freetype)
 unset(SKIP_INSTALL_ALL)
 set_target_properties(freetype PROPERTIES
diff --git a/cmake/deps/glad/CMakeLists.txt b/cmake/deps/glad/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.28...4.1 FATAL_ERROR)
 
 project(glad C)
 
diff --git a/cmake/deps/glfw.cmake b/cmake/deps/glfw.cmake
@@ -4,6 +4,7 @@ include_guard(GLOBAL)
 FetchContent_Declare(glfw
   URL "https://github.com/glfw/glfw/archive/3.4.tar.gz"
   URL_HASH SHA256=c038d34200234d071fae9345bc455e4a8f2f544ab60150765d7704e08f3dac01
+  DOWNLOAD_NO_PROGRESS ON
   EXCLUDE_FROM_ALL
   SYSTEM)
 message(STATUS "Fetch glfw ...")
diff --git a/cmake/deps/glm.cmake b/cmake/deps/glm.cmake
@@ -4,9 +4,11 @@ include_guard(GLOBAL)
 FetchContent_Declare(glm
   URL "https://github.com/g-truc/glm/archive/1.0.1.tar.gz"
   URL_HASH SHA256=9f3174561fd26904b23f0db5e560971cbf9b3cbda0b280f04d5c379d03bf234c
+  DOWNLOAD_NO_PROGRESS ON
   EXCLUDE_FROM_ALL
   SYSTEM)
 message(STATUS "Fetch glm ...")
+SET(CMAKE_POLICY_VERSION_MINIMUM 3.10) # Remove with next version
 FetchContent_MakeAvailable(glm)
 target_compile_definitions(glm PUBLIC GLM_ENABLE_EXPERIMENTAL)
 set_target_properties(glm PROPERTIES FOLDER libs)
diff --git a/cmake/deps/glowl.cmake b/cmake/deps/glowl.cmake
@@ -6,6 +6,7 @@ find_package(glad REQUIRED)
 FetchContent_Declare(glowl
   URL "https://github.com/invor/glowl/archive/e075724a649bd1d57e464d9432556fb69be22699.tar.gz"
   URL_HASH SHA256=aa4d556d4942105d5159a098cceb2845ac173fb80bda240de164f11e88d08f05
+  DOWNLOAD_NO_PROGRESS ON
   EXCLUDE_FROM_ALL
   SYSTEM)
 message(STATUS "Fetch glowl ...")
diff --git a/cmake/deps/iconfontcppheaders.cmake b/cmake/deps/iconfontcppheaders.cmake
@@ -4,6 +4,7 @@ include_guard(GLOBAL)
 FetchContent_Declare(iconfontcppheaders
   URL "https://github.com/juliettef/IconFontCppHeaders/archive/1c004c59fea885bab18897fb8387df10c7d9307f.tar.gz"
   URL_HASH SHA256=bb5171c544bc18a42e84ba5ccb842426dbb8fa6dfe91ff632e0c8fdce13bc912
+  DOWNLOAD_NO_PROGRESS ON
   SOURCE_SUBDIR non-existing-path-to-prevent-add-subdirectory
   EXCLUDE_FROM_ALL
   SYSTEM)
diff --git a/cmake/deps/iconfontcppheaders/CMakeLists.txt b/cmake/deps/iconfontcppheaders/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.28...4.1 FATAL_ERROR)
 
 project(iconfontcppheaders)
 
diff --git a/cmake/deps/imgui.cmake b/cmake/deps/imgui.cmake
@@ -7,6 +7,7 @@ find_package(freetype REQUIRED)
 FetchContent_Declare(imgui
   URL "https://github.com/ocornut/imgui/archive/v1.92.2b-docking.tar.gz"
   URL_HASH SHA256=f6ad86e6f938fdda4d5e362b9a9b39158963dd3257fdc9902efc148c0c0c39f9
+  DOWNLOAD_NO_PROGRESS ON
   SOURCE_SUBDIR non-existing-path-to-prevent-add-subdirectory
   EXCLUDE_FROM_ALL
   SYSTEM)
diff --git a/cmake/deps/imgui/CMakeLists.txt b/cmake/deps/imgui/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.28...4.1 FATAL_ERROR)
 
 project(imgui)
 
diff --git a/cmake/deps/imguiclub.cmake b/cmake/deps/imguiclub.cmake
@@ -6,6 +6,7 @@ find_package(imgui REQUIRED)
 FetchContent_Declare(imguiclub
   URL "https://github.com/ocornut/imgui_club/archive/019ed6171a5b46448eb8a2c8e7e8a1d792c722fd.tar.gz"
   URL_HASH SHA256=cd003517fc645bafcf2e13316a150debc1934f9e200aae55a1b9b2366c58cdec
+  DOWNLOAD_NO_PROGRESS ON
   SOURCE_SUBDIR non-existing-path-to-prevent-add-subdirectory
   EXCLUDE_FROM_ALL
   SYSTEM)
diff --git a/cmake/deps/imguiclub/CMakeLists.txt b/cmake/deps/imguiclub/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.28...4.1 FATAL_ERROR)
 
 project(imguiclub)
 
diff --git a/cmake/deps/natsort.cmake b/cmake/deps/natsort.cmake
@@ -4,6 +4,7 @@ include_guard(GLOBAL)
 FetchContent_Declare(natsort
   URL "https://github.com/sourcefrog/natsort/archive/cdd8df9602e727482ae5e051cff74b7ec7ffa07a.tar.gz"
   URL_HASH SHA256=5b24abd4011ffe4754839a4f2648ed6dd64c8b28c95836bcecc5c7dc868108af
+  DOWNLOAD_NO_PROGRESS ON
   SOURCE_SUBDIR non-existing-path-to-prevent-add-subdirectory
   EXCLUDE_FROM_ALL
   SYSTEM)
diff --git a/cmake/deps/natsort/CMakeLists.txt b/cmake/deps/natsort/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.28...4.1 FATAL_ERROR)
 
 project(natsort)
 
diff --git a/cmake/deps/nlohmann_json.cmake b/cmake/deps/nlohmann_json.cmake
@@ -4,6 +4,7 @@ include_guard(GLOBAL)
 FetchContent_Declare(json
   URL "https://github.com/nlohmann/json/releases/download/v3.12.0/json.tar.xz"
   URL_HASH SHA256=42f6e95cad6ec532fd372391373363b62a14af6d771056dbfc86160e6dfff7aa
+  DOWNLOAD_NO_PROGRESS ON
   EXCLUDE_FROM_ALL
   SYSTEM)
 message(STATUS "Fetch json ...")
@@ -13,6 +14,7 @@ mark_as_advanced(FORCE
   FETCHCONTENT_UPDATES_DISCONNECTED_JSON
   JSON_BuildTests
   JSON_CI
+  JSON_Diagnostic_Positions
   JSON_Diagnostics
   JSON_DisableEnumSerialization
   JSON_GlobalUDLs
diff --git a/cmake/deps/portable_file_dialogs.cmake b/cmake/deps/portable_file_dialogs.cmake
@@ -4,6 +4,7 @@ include_guard(GLOBAL)
 FetchContent_Declare(portable_file_dialogs
   URL "https://github.com/samhocevar/portable-file-dialogs/archive/c12ea8c9a727f5320a2b4570aee863bbede2a204.tar.gz"
   URL_HASH SHA256=8f06b35c6017e7e6796cf7393815f7ccde2268a9259d553573da78e2a405b1b2
+  DOWNLOAD_NO_PROGRESS ON
   SOURCE_SUBDIR non-existing-path-to-prevent-add-subdirectory
   EXCLUDE_FROM_ALL
   SYSTEM)
diff --git a/cmake/deps/portable_file_dialogs/CMakeLists.txt b/cmake/deps/portable_file_dialogs/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.28...4.1 FATAL_ERROR)
 
 project(portable_file_dialogs VERSION 1.0 LANGUAGES CXX)
 
diff --git a/cmake/deps/pybind11.cmake b/cmake/deps/pybind11.cmake
@@ -4,12 +4,14 @@ include_guard(GLOBAL)
 FetchContent_Declare(pybind11
   URL "https://github.com/pybind/pybind11/archive/v2.13.6.tar.gz"
   URL_HASH SHA256=e08cb87f4773da97fa7b5f035de8763abc656d87d5773e62f6da0587d1f0ec20
+  DOWNLOAD_NO_PROGRESS ON
   EXCLUDE_FROM_ALL
   SYSTEM)
 message(STATUS "Fetch pybind11 ...")
 option(PYBIND11_FINDPYTHON "" ON)
 option(PYBIND11_INSTALL "" OFF)
 option(PYBIND11_TEST "" OFF)
+SET(CMAKE_POLICY_VERSION_MINIMUM 3.10) # Remove with next version
 FetchContent_MakeAvailable(pybind11)
 mark_as_advanced(FORCE
   FETCHCONTENT_SOURCE_DIR_PYBIND11
diff --git a/cmake/deps/spdlog.cmake b/cmake/deps/spdlog.cmake
@@ -4,6 +4,7 @@ include_guard(GLOBAL)
 FetchContent_Declare(spdlog
   URL "https://github.com/gabime/spdlog/archive/v1.15.3.tar.gz"
   URL_HASH SHA256=15a04e69c222eb6c01094b5c7ff8a249b36bb22788d72519646fb85feb267e67
+  DOWNLOAD_NO_PROGRESS ON
   EXCLUDE_FROM_ALL
   SYSTEM)
 message(STATUS "Fetch spdlog ...")
diff --git a/cmake/deps/tinygltf.cmake b/cmake/deps/tinygltf.cmake
@@ -6,6 +6,7 @@ find_package(nlohmann_json REQUIRED)
 FetchContent_Declare(tinygltf
   URL "https://github.com/syoyo/tinygltf/archive/v2.9.6.tar.gz"
   URL_HASH SHA256=ba2c47a095136bfc8a5d085421e60eb8e8df3bca4ae36eb395084c1b264c6927
+  DOWNLOAD_NO_PROGRESS ON
   SOURCE_SUBDIR non-existing-path-to-prevent-add-subdirectory
   EXCLUDE_FROM_ALL
   SYSTEM)
diff --git a/cmake/deps/tinygltf/CMakeLists.txt b/cmake/deps/tinygltf/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.28...4.1 FATAL_ERROR)
 
 project(tinygltf)
 
diff --git a/cmake/deps/valvefilevdf.cmake b/cmake/deps/valvefilevdf.cmake
@@ -4,6 +4,7 @@ include_guard(GLOBAL)
 FetchContent_Declare(vdf
   URL "https://github.com/TinyTinni/ValveFileVDF/archive/v1.1.1.tar.gz"
   URL_HASH SHA256=de16a199c535c3b49f2aa0bd17e3154e02b32fa7b0949053ba6d981f8c32197f
+  DOWNLOAD_NO_PROGRESS ON
   EXCLUDE_FROM_ALL
   SYSTEM)
 message(STATUS "Fetch vdf ...")
diff --git a/cmake/deps/zlib.cmake b/cmake/deps/zlib.cmake
@@ -4,6 +4,7 @@ include_guard(GLOBAL)
 FetchContent_Declare(zlib
   URL "https://github.com/madler/zlib/archive/v1.3.1.tar.gz"
   URL_HASH SHA256=17e88863f3600672ab49182f217281b6fc4d3c762bde361935e436a95214d05c
+  DOWNLOAD_NO_PROGRESS ON
   SOURCE_SUBDIR non-existing-path-to-prevent-add-subdirectory
   EXCLUDE_FROM_ALL
   SYSTEM)
diff --git a/cmake/deps/zlib/CMakeLists.txt b/cmake/deps/zlib/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.28...4.1 FATAL_ERROR)
 
 project(zlib
   VERSION 1.3.1
diff --git a/libsavepy/CMakeLists.txt b/libsavepy/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.28...4.1 FATAL_ERROR)
 
 project(SatisfactorySavePy
   LANGUAGES CXX)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cmake_minimum_required(VERSION 3.28...3.31 FATAL_ERROR)`
	`1`	`+cmake_minimum_required(VERSION 3.28...4.1 FATAL_ERROR)`
`2`	`2`
`3`	`3`	`# Disable in source build`
`4`	`4`	`set(CMAKE_DISABLE_SOURCE_CHANGES ON)`