diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e520e3f1eee3ebbf5b3f6e31f222ef20b652c51..976d74fcfd336f6552d5646fb071df4a02a6b779 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # === Preamble ===
-cmake_minimum_required(VERSION 3.12...3.19.1)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 # Make the 'cmake' module directory visible to CMake.
 list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
diff --git a/FSL/CMakeLists.txt b/FSL/CMakeLists.txt
index 8ab1479ffad02ad738d96d52e63f19a2245fd610..0d17544ef573139bc3aea76999da060aa0c86bc2 100644
--- a/FSL/CMakeLists.txt
+++ b/FSL/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 project(fsl VERSION 0.1 LANGUAGES CXX)
 
diff --git a/FullSimLight/CMakeLists.txt b/FullSimLight/CMakeLists.txt
index 7742d0a7220d190cf1b59ef508490367e39c91a7..efe7f7744274989b80ff77f8b931edc7c8475ded 100644
--- a/FullSimLight/CMakeLists.txt
+++ b/FullSimLight/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # CMake settings
-cmake_minimum_required( VERSION 3.14 )
+cmake_minimum_required(VERSION 3.16...3.26)
 
 # Dummy call to 'project()', needed to set 'PROJECT_SOURCE_DIR'
 project( "FullSimLight" )
diff --git a/FullSimLight/Plugins/CMakeLists.txt b/FullSimLight/Plugins/CMakeLists.txt
index 0e31deec640a8ca32761d23dc3649489a37f8d42..87a40ac556eb9b81b83f2c944563a2de25a13051 100644
--- a/FullSimLight/Plugins/CMakeLists.txt
+++ b/FullSimLight/Plugins/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # CMake settings
-cmake_minimum_required( VERSION 3.14 )
+cmake_minimum_required(VERSION 3.16...3.26)
 
 # Dummy call to 'project()', needed to set 'PROJECT_SOURCE_DIR'
 project( "Plugins" )
diff --git a/FullSimLight/Plugins/Examples/EventGeneratorPlugins/FSLExamplePrimaryGeneratorPlugin/CMakeLists.txt b/FullSimLight/Plugins/Examples/EventGeneratorPlugins/FSLExamplePrimaryGeneratorPlugin/CMakeLists.txt
index d7eb29db21b982d5c91d62bcacbcb81fc9493f77..693187bbcde78d7ca03ef29e957aafe6dceb5316 100644
--- a/FullSimLight/Plugins/Examples/EventGeneratorPlugins/FSLExamplePrimaryGeneratorPlugin/CMakeLists.txt
+++ b/FullSimLight/Plugins/Examples/EventGeneratorPlugins/FSLExamplePrimaryGeneratorPlugin/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Set up the project.
-cmake_minimum_required( VERSION 3.1 )
+cmake_minimum_required(VERSION 3.16...3.26)
 
 set(CMAKE_CXX_STANDARD 17)
 
diff --git a/FullSimLight/Plugins/Examples/MagneticFieldPlugins/UniformMagneticFieldPlugin/CMakeLists.txt b/FullSimLight/Plugins/Examples/MagneticFieldPlugins/UniformMagneticFieldPlugin/CMakeLists.txt
index dcd0dfeb7522733b94e3d6c087003aee07906543..7d5ea4dd72befdb823b7ce13dd9eca1ef23440b3 100644
--- a/FullSimLight/Plugins/Examples/MagneticFieldPlugins/UniformMagneticFieldPlugin/CMakeLists.txt
+++ b/FullSimLight/Plugins/Examples/MagneticFieldPlugins/UniformMagneticFieldPlugin/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Set up the project.
-cmake_minimum_required( VERSION 3.1 )
+cmake_minimum_required(VERSION 3.16...3.26)
 
 set(CMAKE_CXX_STANDARD 17)
 
diff --git a/FullSimLight/Plugins/Examples/PhysicsListPlugins/FSLTestPhysListPlugins/CMakeLists.txt b/FullSimLight/Plugins/Examples/PhysicsListPlugins/FSLTestPhysListPlugins/CMakeLists.txt
index c37cd349c3f808343119693b02e5efcfcaee0e86..ca7320457e11fbb24075b0822e3801b923a3cf6c 100644
--- a/FullSimLight/Plugins/Examples/PhysicsListPlugins/FSLTestPhysListPlugins/CMakeLists.txt
+++ b/FullSimLight/Plugins/Examples/PhysicsListPlugins/FSLTestPhysListPlugins/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Set up the project.
-cmake_minimum_required( VERSION 3.1 )
+cmake_minimum_required(VERSION 3.16...3.26)
 
 set(CMAKE_CXX_STANDARD 17)
 
diff --git a/FullSimLight/Plugins/Examples/SensitiveDetectorPlugins/SDPlugin/CMakeLists.txt b/FullSimLight/Plugins/Examples/SensitiveDetectorPlugins/SDPlugin/CMakeLists.txt
index 819b2d8fe056c8e81111b7b349b5daf0c653f33a..04c5f26c886c09f8f5897c95b23f0ca3593ad0d5 100644
--- a/FullSimLight/Plugins/Examples/SensitiveDetectorPlugins/SDPlugin/CMakeLists.txt
+++ b/FullSimLight/Plugins/Examples/SensitiveDetectorPlugins/SDPlugin/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Set up the project.
-cmake_minimum_required( VERSION 3.1 )
+cmake_minimum_required(VERSION 3.16...3.26)
 
 set(CMAKE_CXX_STANDARD 17)
 
diff --git a/FullSimLight/Plugins/Examples/UserActionPlugins/CMakeLists.txt b/FullSimLight/Plugins/Examples/UserActionPlugins/CMakeLists.txt
index 73e5e728720dd985711926ed1014c08f5b0264c4..436fd3c3cef3d4a494b4ddf260e67489fca34319 100644
--- a/FullSimLight/Plugins/Examples/UserActionPlugins/CMakeLists.txt
+++ b/FullSimLight/Plugins/Examples/UserActionPlugins/CMakeLists.txt
@@ -1,7 +1,7 @@
 # (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # Set up the project.
-cmake_minimum_required( VERSION 3.1 )
+cmake_minimum_required(VERSION 3.16...3.26)
 project( "UserActionsPlugins" )
 
 #Set up the project. Check if we build it with GeoModel or individually
diff --git a/FullSimLight/Plugins/Examples/UserActionPlugins/DummyUserActionPlugin/CMakeLists.txt b/FullSimLight/Plugins/Examples/UserActionPlugins/DummyUserActionPlugin/CMakeLists.txt
index 2cf5e92a851d3f3928b93e7d5c55abb788ff3363..4452ef6bb773c364177eea50d9941c96829ce868 100644
--- a/FullSimLight/Plugins/Examples/UserActionPlugins/DummyUserActionPlugin/CMakeLists.txt
+++ b/FullSimLight/Plugins/Examples/UserActionPlugins/DummyUserActionPlugin/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Set up the project.
-cmake_minimum_required( VERSION 3.1 )
+cmake_minimum_required(VERSION 3.16...3.26)
 
 set(CMAKE_CXX_STANDARD 17)
 
diff --git a/FullSimLight/Plugins/Examples/UserActionPlugins/DummyUserActionPlugin/DummyUserActionsPlugin/CMakeLists.txt b/FullSimLight/Plugins/Examples/UserActionPlugins/DummyUserActionPlugin/DummyUserActionsPlugin/CMakeLists.txt
index 71a9be12c1fa7ae527295946de068d5687e6b171..e34aaa7b160e32b5a242a932b8578f0ee12bbd5a 100644
--- a/FullSimLight/Plugins/Examples/UserActionPlugins/DummyUserActionPlugin/DummyUserActionsPlugin/CMakeLists.txt
+++ b/FullSimLight/Plugins/Examples/UserActionPlugins/DummyUserActionPlugin/DummyUserActionsPlugin/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 # Set up the project.
-cmake_minimum_required( VERSION 3.1 )
+cmake_minimum_required(VERSION 3.16...3.26)
 project( "DummyUserActionsPlugin" )
 
 
diff --git a/FullSimLight/Plugins/HitsPlugin/CMakeLists.txt b/FullSimLight/Plugins/HitsPlugin/CMakeLists.txt
index e9fb430c20446ee783972c63c06bf8525ef17699..82a3a31a068f90b8a3df73d5342bf0a611170d6a 100644
--- a/FullSimLight/Plugins/HitsPlugin/CMakeLists.txt
+++ b/FullSimLight/Plugins/HitsPlugin/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Set up the project.
-cmake_minimum_required( VERSION 3.1 )
+cmake_minimum_required(VERSION 3.16...3.26)
 
 set(CMAKE_CXX_STANDARD 17)
 
diff --git a/FullSimLight/Plugins/TracksPlugin/CMakeLists.txt b/FullSimLight/Plugins/TracksPlugin/CMakeLists.txt
index 21a411fbe9c6da14103555d6952596599c8c86ce..95886d16064604296fc46805b4206231f6e6ef7d 100644
--- a/FullSimLight/Plugins/TracksPlugin/CMakeLists.txt
+++ b/FullSimLight/Plugins/TracksPlugin/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Set up the project.
-cmake_minimum_required( VERSION 3.1 )
+cmake_minimum_required(VERSION 3.16...3.26)
 
 set(CMAKE_CXX_STANDARD 17)
 
diff --git a/FullSimLight/perf/CMakeLists.txt b/FullSimLight/perf/CMakeLists.txt
index 8215406042ca7dff20db39da14b08e7b9355e508..c4d585389b6246200fa82b0e39ded126d72604d0 100644
--- a/FullSimLight/perf/CMakeLists.txt
+++ b/FullSimLight/perf/CMakeLists.txt
@@ -1,5 +1,4 @@
-cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
-cmake_policy(VERSION 3.12...3.18)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 project(FullSimLightPerf)
 
diff --git a/GeoModelCore/CMakeLists.txt b/GeoModelCore/CMakeLists.txt
index 53c5de784abfc83e339d015d58cced12984e75cd..d96b29665216e71d5de39bea36917bef6ae8eef0 100644
--- a/GeoModelCore/CMakeLists.txt
+++ b/GeoModelCore/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Set up the (sub-)project.
-cmake_minimum_required( VERSION 3.1 )
+cmake_minimum_required(VERSION 3.16...3.26)
 #project( "GeoModelCore" VERSION 4.1.0 LANGUAGES CXX )
 project( "GeoModelCore" VERSION ${GeoModel_VERSION} LANGUAGES CXX )
 
diff --git a/GeoModelExamples/CMakeLists.txt b/GeoModelExamples/CMakeLists.txt
index 4f322aa26a3cb5b1d88345c6fe778b7deba9129f..2ac1024bc4281280c7395b585a9d8f9633c51e0e 100644
--- a/GeoModelExamples/CMakeLists.txt
+++ b/GeoModelExamples/CMakeLists.txt
@@ -6,7 +6,7 @@
 ################################################################################
 
 # Set up the project.
-cmake_minimum_required( VERSION 3.1 )
+cmake_minimum_required(VERSION 3.16...3.26)
 project( "GeoModelExamples" VERSION 4.1.0 LANGUAGES CXX )
 
 # Getting-started examples
diff --git a/GeoModelExamples/GeoActions/CMakeLists.txt b/GeoModelExamples/GeoActions/CMakeLists.txt
index 7f0efb2795bac78051a08242beaf3100158a9f10..025c7c37b893d133bb1e4e055f2d24189d06d1e9 100644
--- a/GeoModelExamples/GeoActions/CMakeLists.txt
+++ b/GeoModelExamples/GeoActions/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - Nov, 2018
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 #project(GeoActions)
 
diff --git a/GeoModelExamples/GeoFullPhysVol/CMakeLists.txt b/GeoModelExamples/GeoFullPhysVol/CMakeLists.txt
index 0dafa939e9258fd32cca4c51cb61aa647ddde5ba..8168ff095aebe6ae6bae7b3d27205a6d719fb915 100644
--- a/GeoModelExamples/GeoFullPhysVol/CMakeLists.txt
+++ b/GeoModelExamples/GeoFullPhysVol/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - Aug, 2020
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 #project(GeoFullPhysVolEx)
 
diff --git a/GeoModelExamples/GeoShapeExamples/CMakeLists.txt b/GeoModelExamples/GeoShapeExamples/CMakeLists.txt
index 5fc886f4830c311cbbdc5cc290ecd3927562eecd..19bfd486d1ffc14ee531357e3394d94c318a3aaa 100644
--- a/GeoModelExamples/GeoShapeExamples/CMakeLists.txt
+++ b/GeoModelExamples/GeoShapeExamples/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - Nov, 2018
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 #project(GeoShapeExamples)
 
diff --git a/GeoModelExamples/GeoShiftUnion/CMakeLists.txt b/GeoModelExamples/GeoShiftUnion/CMakeLists.txt
index 4d16de5fae91cb92dd96b6d64a24238f8ddb0dd8..71522fd448e10d3f35ad6c5ebfcb18a4abc324bd 100644
--- a/GeoModelExamples/GeoShiftUnion/CMakeLists.txt
+++ b/GeoModelExamples/GeoShiftUnion/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - Nov, 2018
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 #project(GeoShiftUnion)
 
diff --git a/GeoModelExamples/GeoTessellatedSolidExamples/CMakeLists.txt b/GeoModelExamples/GeoTessellatedSolidExamples/CMakeLists.txt
index 82c2df633ee7a82ae4fc26abcc937198b62627af..c5be2e21070123314d1b7ba5cd7ccbe18fafc394 100644
--- a/GeoModelExamples/GeoTessellatedSolidExamples/CMakeLists.txt
+++ b/GeoModelExamples/GeoTessellatedSolidExamples/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - Sep, 2019
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 #project(GeoTessellatedSolidExample)
 
diff --git a/GeoModelExamples/HelloDummyMaterial/CMakeLists.txt b/GeoModelExamples/HelloDummyMaterial/CMakeLists.txt
index 69c45abbfe09532e60ee858a02fb1c273b8c82cd..ac6c72e7c86f82ff481239944ec965296e60d97c 100644
--- a/GeoModelExamples/HelloDummyMaterial/CMakeLists.txt
+++ b/GeoModelExamples/HelloDummyMaterial/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - Nov, 2019
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 #project(HelloDummyMaterial)
 
diff --git a/GeoModelExamples/HelloGeo/CMakeLists.txt b/GeoModelExamples/HelloGeo/CMakeLists.txt
index a7964d597ea9c82bb4ad4323ad6d99c3097025ea..ecb52b75649cd9772f276775cf4d2759972d59aa 100644
--- a/GeoModelExamples/HelloGeo/CMakeLists.txt
+++ b/GeoModelExamples/HelloGeo/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - Nov, 2018
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 # Compile with C++17
 set(CMAKE_CXX_STANDARD 17)
diff --git a/GeoModelExamples/HelloGeoRead/CMakeLists.txt b/GeoModelExamples/HelloGeoRead/CMakeLists.txt
index 59f098de3ae233c4a5885fce0502e24580ff5269..62b805c8bafcfacf55ff58fd008e53ddc66aa746 100644
--- a/GeoModelExamples/HelloGeoRead/CMakeLists.txt
+++ b/GeoModelExamples/HelloGeoRead/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - Nov, 2018
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 #project(HelloGeoRead)
 
diff --git a/GeoModelExamples/HelloGeoRead2G4/CMakeLists.txt b/GeoModelExamples/HelloGeoRead2G4/CMakeLists.txt
index be563d9b336cbcf6dbf6fa71e54da44aa1682e9d..76b8e265a2f9ffe0ac941a1f3fd73aa975798a08 100644
--- a/GeoModelExamples/HelloGeoRead2G4/CMakeLists.txt
+++ b/GeoModelExamples/HelloGeoRead2G4/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - Nov, 2018
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 #project(HelloGeoRead2G4)
 
diff --git a/GeoModelExamples/HelloGeoReadNodeAction/CMakeLists.txt b/GeoModelExamples/HelloGeoReadNodeAction/CMakeLists.txt
index 68ce5cafcd820bc195654e8f1747a7969ed43ee3..3b64ca9add2c9862c2173fd476abff585ef40ae3 100644
--- a/GeoModelExamples/HelloGeoReadNodeAction/CMakeLists.txt
+++ b/GeoModelExamples/HelloGeoReadNodeAction/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - May, 2022
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 #project(HelloGeoRead)
 
diff --git a/GeoModelExamples/HelloGeoWrite/CMakeLists.txt b/GeoModelExamples/HelloGeoWrite/CMakeLists.txt
index 498d3b3f24b9b2a55438a772f0778a323bc63dfb..9efb1aea4486858bb4c1c4cba4014accc823f7e9 100644
--- a/GeoModelExamples/HelloGeoWrite/CMakeLists.txt
+++ b/GeoModelExamples/HelloGeoWrite/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - Nov, 2018
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 #project(HelloGeoWrite)
 
diff --git a/GeoModelExamples/HelloGeoWriteReadWrite/CMakeLists.txt b/GeoModelExamples/HelloGeoWriteReadWrite/CMakeLists.txt
index c10f7fc3e210175d4862acbbab7818af720fa268..b89dcacde94f615fbb7cd04495f8f3b6d6038d94 100644
--- a/GeoModelExamples/HelloGeoWriteReadWrite/CMakeLists.txt
+++ b/GeoModelExamples/HelloGeoWriteReadWrite/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - May, 2022
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 #project(HelloGeoWrite)
 
diff --git a/GeoModelExamples/HelloToy/CMakeLists.txt b/GeoModelExamples/HelloToy/CMakeLists.txt
index aff08b4673a1b7f88ed8ad8b26abf41d983f763b..0d66f644f671b330132e5d3eacbcae9fc6168211 100644
--- a/GeoModelExamples/HelloToy/CMakeLists.txt
+++ b/GeoModelExamples/HelloToy/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - Aug, 2020
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 #project(HelloToy)
 
diff --git a/GeoModelExamples/HelloToyDetectorFactory/CMakeLists.txt b/GeoModelExamples/HelloToyDetectorFactory/CMakeLists.txt
index 2d4aa975f779baddede0aa9b8659daf7bb3bf9c0..1abe80edad78c1876028499c6a19993cccde2084 100644
--- a/GeoModelExamples/HelloToyDetectorFactory/CMakeLists.txt
+++ b/GeoModelExamples/HelloToyDetectorFactory/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - Nov, 2018
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 #project(HelloToyDetectorFactory)
 
diff --git a/GeoModelExamples/HelloToyXML/CMakeLists.txt b/GeoModelExamples/HelloToyXML/CMakeLists.txt
index 2bad58897e17f294d5f064c4d251f27d84499e69..d05f912488d719e4b27ffa905fc25069af11a970 100644
--- a/GeoModelExamples/HelloToyXML/CMakeLists.txt
+++ b/GeoModelExamples/HelloToyXML/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - Aug, 2020
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 project(HelloToyXML)
 
diff --git a/GeoModelExamples/KitchenSinkPlugin/CMakeLists.txt b/GeoModelExamples/KitchenSinkPlugin/CMakeLists.txt
index b7f302a25299f2c44af480b4dbef6e83f5b08a8c..03fe5807050a679bbf6f2a76b9640ca601a43a27 100644
--- a/GeoModelExamples/KitchenSinkPlugin/CMakeLists.txt
+++ b/GeoModelExamples/KitchenSinkPlugin/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - Nov, 2018
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 # Compile with C++17
 set(CMAKE_CXX_STANDARD 17)
diff --git a/GeoModelExamples/MinimalPlugin/CMakeLists.txt b/GeoModelExamples/MinimalPlugin/CMakeLists.txt
index 3b35d67b5339ae27a73cec14021d1fe0f8044987..f18dbe0f13576663c90929ba38bd2f2cc0ec258e 100644
--- a/GeoModelExamples/MinimalPlugin/CMakeLists.txt
+++ b/GeoModelExamples/MinimalPlugin/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - May, 2022
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 # Compile with C++17
 set(CMAKE_CXX_STANDARD 17)
diff --git a/GeoModelExamples/NestedVolumes/CMakeLists.txt b/GeoModelExamples/NestedVolumes/CMakeLists.txt
index b419eeb25027f0c2a5226a1d8c34806665544a0a..2d4b334ebe51b382ce4a55151f7aecbd490fef0b 100644
--- a/GeoModelExamples/NestedVolumes/CMakeLists.txt
+++ b/GeoModelExamples/NestedVolumes/CMakeLists.txt
@@ -5,7 +5,7 @@
 # author: Riccardo Maria BIANCHI @ CERN - Nov, 2018
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 #project(HelloGeoWrite)
 
diff --git a/GeoModelG4/CMakeLists.txt b/GeoModelG4/CMakeLists.txt
index 128f647f3b4d3215e7777e83194b51e05844144a..2b6c15f3f91ca53b826756313abac0b35a5b4f1d 100644
--- a/GeoModelG4/CMakeLists.txt
+++ b/GeoModelG4/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # CMake settings
-cmake_minimum_required( VERSION 3.14 )
+cmake_minimum_required(VERSION 3.16...3.26)
 
 # Dummy call to 'project()', needed to set 'PROJECT_SOURCE_DIR'
 project( "GeoModelG4" )
diff --git a/GeoModelG4/GeoMaterial2G4/CMakeLists.txt b/GeoModelG4/GeoMaterial2G4/CMakeLists.txt
index 9cf118c6b32f203c486757cc87fe5f139d35f521..024665666172ea340934104dc11cea9987e5f636 100644
--- a/GeoModelG4/GeoMaterial2G4/CMakeLists.txt
+++ b/GeoModelG4/GeoMaterial2G4/CMakeLists.txt
@@ -3,7 +3,7 @@
 ################################################################################
 # Package: GeoMaterial2G4
 ################################################################################
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16...3.26)
 project( "GeoMaterial2G4" VERSION ${GeoModel_VERSION} LANGUAGES CXX )
 
 # Use the GNU install directory names.
diff --git a/GeoModelG4/GeoModel2G4/CMakeLists.txt b/GeoModelG4/GeoModel2G4/CMakeLists.txt
index df227e6de95a31ba83546887e83bdac3db111a4f..fff813ad45ec158a388aff3d296d968b340b0d99 100644
--- a/GeoModelG4/GeoModel2G4/CMakeLists.txt
+++ b/GeoModelG4/GeoModel2G4/CMakeLists.txt
@@ -4,7 +4,7 @@
 # Package: GeoModel2G4
 ################################################################################
 
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 # Declare the package name
 project( "GeoModel2G4" VERSION ${GeoModel_VERSION}  LANGUAGES CXX )
diff --git a/GeoModelG4/GeoModel2G4/original_GeoModel2G4/CMakeLists.txt b/GeoModelG4/GeoModel2G4/original_GeoModel2G4/CMakeLists.txt
index 293f17da2fa8af029d7bb596fc8b193717b76c7f..55c9883f6043b6465bd87306a6c547808d61c887 100644
--- a/GeoModelG4/GeoModel2G4/original_GeoModel2G4/CMakeLists.txt
+++ b/GeoModelG4/GeoModel2G4/original_GeoModel2G4/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Package: Geo2G4
 ################################################################################
 
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 # Declare the package name
 project( "Geo2G4" VERSION 1.0.0 LANGUAGES CXX )
diff --git a/GeoModelIO/GeoModelRead/examples/hellogeo/CMakeLists.txt.example b/GeoModelIO/GeoModelRead/examples/hellogeo/CMakeLists.txt.example
index 591b24abc759daef2745cfe1fc0e9c8cbdf2d633..65aaaad5408f9b625ec9f409ad618170099d4389 100644
--- a/GeoModelIO/GeoModelRead/examples/hellogeo/CMakeLists.txt.example
+++ b/GeoModelIO/GeoModelRead/examples/hellogeo/CMakeLists.txt.example
@@ -3,7 +3,7 @@
 # author: Riccardo Maria BIANCHI <rbianchi@cern.ch> - Nov, 2018
 ################################################################################
 
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.16...3.26)
 
 project(hellogeo)
 
diff --git a/GeoModelTools/CMakeLists.txt b/GeoModelTools/CMakeLists.txt
index 738f05fcc77372e932a93965af045e831acd1f24..7e8ccdcd0125f7d7c632c4a3f0b5774e282c4e95 100644
--- a/GeoModelTools/CMakeLists.txt
+++ b/GeoModelTools/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # CMake settings
-cmake_minimum_required( VERSION 3.14 )
+cmake_minimum_required(VERSION 3.16...3.26)
 
 # Dummy call to 'project()', needed to set 'PROJECT_SOURCE_DIR'
 project( "GeoModelTools" )
diff --git a/GeoModelVisualization/CMakeLists.txt b/GeoModelVisualization/CMakeLists.txt
index 054444a47a272f347c06333958252d30bdc31b3d..647a12c2b91bf072d9c5f0cf9ff80f25bc82f554 100644
--- a/GeoModelVisualization/CMakeLists.txt
+++ b/GeoModelVisualization/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # CMake settings
-cmake_minimum_required( VERSION 3.14 )
+cmake_minimum_required(VERSION 3.16...3.26)
 
 # Dummy call to 'project()', needed to set 'PROJECT_SOURCE_DIR'
 project( "GeoModelTools" )