diff -U 3 -dHrN a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt	2025-05-31 14:56:19.000000000 +0200
+++ b/CMakeLists.txt	2025-07-16 18:08:22.362177744 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.20...4.0)
 PROJECT(libindi C CXX)
 
 # As moc files are generated in the binary dir, tell CMake
diff -U 3 -dHrN a/drivers/skeleton/CMakeLists.txt b/drivers/skeleton/CMakeLists.txt
--- a/drivers/skeleton/CMakeLists.txt	2025-05-31 14:56:19.000000000 +0200
+++ b/drivers/skeleton/CMakeLists.txt	2025-07-16 18:11:04.617535923 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...4.0)
 PROJECT(libindi-skeletons C CXX)
 
 include_directories(../../)
diff -U 3 -dHrN a/indiserver/CMakeLists.txt b/indiserver/CMakeLists.txt
--- a/indiserver/CMakeLists.txt	2025-05-31 14:56:19.000000000 +0200
+++ b/indiserver/CMakeLists.txt	2025-07-16 18:08:38.024438668 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...4.0)
 project(indiserver CXX)
 
 if(WIN32 OR ANDROID)
diff -U 3 -dHrN a/integs/CMakeLists.txt b/integs/CMakeLists.txt
--- a/integs/CMakeLists.txt	2025-05-31 14:56:19.000000000 +0200
+++ b/integs/CMakeLists.txt	2025-07-16 18:08:31.665071321 +0200
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 3.0)
+CMAKE_MINIMUM_REQUIRED (VERSION 3.0...4.0)
 
 FIND_PACKAGE (GTest REQUIRED)
 
diff -U 3 -dHrN a/libs/dsp/CMakeLists.txt b/libs/dsp/CMakeLists.txt
--- a/libs/dsp/CMakeLists.txt	2025-05-31 14:56:19.000000000 +0200
+++ b/libs/dsp/CMakeLists.txt	2025-07-16 18:10:16.969763865 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...4.0)
 project(dsp C)
 
 add_library(${PROJECT_NAME} OBJECT "")
diff -U 3 -dHrN a/libs/eventloop/CMakeLists.txt b/libs/eventloop/CMakeLists.txt
--- a/libs/eventloop/CMakeLists.txt	2025-05-31 14:56:19.000000000 +0200
+++ b/libs/eventloop/CMakeLists.txt	2025-07-16 18:10:06.689635807 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...4.0)
 project(eventloop C)
 
 add_library(${PROJECT_NAME} OBJECT "")
diff -U 3 -dHrN a/libs/fpack/CMakeLists.txt b/libs/fpack/CMakeLists.txt
--- a/libs/fpack/CMakeLists.txt	2025-05-31 14:56:19.000000000 +0200
+++ b/libs/fpack/CMakeLists.txt	2025-07-16 18:10:11.985020700 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...4.0)
 project(fpack C)
 
 add_library(${PROJECT_NAME} OBJECT "")
diff -U 3 -dHrN a/libs/hid/CMakeLists.txt b/libs/hid/CMakeLists.txt
--- a/libs/hid/CMakeLists.txt	2025-05-31 14:56:19.000000000 +0200
+++ b/libs/hid/CMakeLists.txt	2025-07-16 18:10:21.713035620 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...4.0)
 project(hid C)
 
 add_library(${PROJECT_NAME} OBJECT "")
diff -U 3 -dHrN a/libs/indiabstractclient/CMakeLists.txt b/libs/indiabstractclient/CMakeLists.txt
--- a/libs/indiabstractclient/CMakeLists.txt	2025-05-31 14:56:19.000000000 +0200
+++ b/libs/indiabstractclient/CMakeLists.txt	2025-07-16 18:10:26.401082475 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...4.0)
 project(indiabstractclient CXX)
 
 add_library(${PROJECT_NAME} OBJECT)
diff -U 3 -dHrN a/libs/indibase/CMakeLists.txt b/libs/indibase/CMakeLists.txt
--- a/libs/indibase/CMakeLists.txt	2025-05-31 14:56:19.000000000 +0200
+++ b/libs/indibase/CMakeLists.txt	2025-07-16 18:10:59.489568582 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...4.0)
 project(indidriver C CXX)
 
 include_directories(.)
diff -U 3 -dHrN a/libs/indiclient/CMakeLists.txt b/libs/indiclient/CMakeLists.txt
--- a/libs/indiclient/CMakeLists.txt	2025-05-31 14:56:19.000000000 +0200
+++ b/libs/indiclient/CMakeLists.txt	2025-07-16 18:10:31.569119795 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...4.0)
 project(indiclient CXX)
 
 # Dependency
diff -U 3 -dHrN a/libs/indiclientqt/CMakeLists.txt b/libs/indiclientqt/CMakeLists.txt
--- a/libs/indiclientqt/CMakeLists.txt	2025-05-31 14:56:19.000000000 +0200
+++ b/libs/indiclientqt/CMakeLists.txt	2025-07-16 18:10:36.729187356 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...4.0)
 project(indiclientqt CXX)
 
 set(QT_ANDROID "" CACHE STRING "Qt Android path")
diff -U 3 -dHrN a/libs/indicore/CMakeLists.txt b/libs/indicore/CMakeLists.txt
--- a/libs/indicore/CMakeLists.txt	2025-05-31 14:56:19.000000000 +0200
+++ b/libs/indicore/CMakeLists.txt	2025-07-16 18:10:49.081377921 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...4.0)
 project(indicore C CXX)
 
 if(NOT WIN32)
diff -U 3 -dHrN a/libs/indidevice/CMakeLists.txt b/libs/indidevice/CMakeLists.txt
--- a/libs/indidevice/CMakeLists.txt	2025-05-31 14:56:19.000000000 +0200
+++ b/libs/indidevice/CMakeLists.txt	2025-07-16 18:10:41.752887047 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...4.0)
 project(indidevice C CXX)
 
 # Dependency
diff -U 3 -dHrN a/libs/sockets/CMakeLists.txt b/libs/sockets/CMakeLists.txt
--- a/libs/sockets/CMakeLists.txt	2025-05-31 14:56:19.000000000 +0200
+++ b/libs/sockets/CMakeLists.txt	2025-07-16 18:10:54.377492034 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...4.0)
 project(sockets CXX)
 
 find_package(Threads REQUIRED)
diff -U 3 -dHrN a/test/CMakeLists.txt b/test/CMakeLists.txt
--- a/test/CMakeLists.txt	2025-05-31 14:56:19.000000000 +0200
+++ b/test/CMakeLists.txt	2025-07-16 18:10:01.184916809 +0200
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 3.0)
+CMAKE_MINIMUM_REQUIRED (VERSION 3.0...4.0)
 
 FIND_PACKAGE (GMock REQUIRED)