Merge pull request #165 from bkuhls/cmake4

garbear · web-flow · commit de1ed4867127 · 2026-03-12T05:38:26.000-07:00
Fix build with CMake 4.x
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensavers.rsxs)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
diff --git a/depends/common/bz2/CMakeLists.txt b/depends/common/bz2/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(bzip2)
 
 if(NOT WIN32)
diff --git a/lib/Implicit/CMakeLists.txt b/lib/Implicit/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5...4.0)
 
 project(Implicit)
 
diff --git a/lib/Rgbhsl/CMakeLists.txt b/lib/Rgbhsl/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5...4.0)
 
 project(Rgbhsl)
 
diff --git a/lib/kodi/gui/gl/CMakeLists.txt b/lib/kodi/gui/gl/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 
 project(kodiOpenGL)
 
diff --git a/lib/rsMath/CMakeLists.txt b/lib/rsMath/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5...4.0)
 
 project(rsMath)
 
diff --git a/src/biof/CMakeLists.txt b/src/biof/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.biof)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/busyspheres/CMakeLists.txt b/src/busyspheres/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.busyspheres)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/colorfire/CMakeLists.txt b/src/colorfire/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.colorfire)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/cyclone/CMakeLists.txt b/src/cyclone/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.cyclone)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/drempels/CMakeLists.txt b/src/drempels/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.drempels)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/euphoria/CMakeLists.txt b/src/euphoria/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.euphoria)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/feedback/CMakeLists.txt b/src/feedback/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.feedback)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/fieldlines/CMakeLists.txt b/src/fieldlines/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.fieldlines)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/flocks/CMakeLists.txt b/src/flocks/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.flocks)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/flux/CMakeLists.txt b/src/flux/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.flux)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/helios/CMakeLists.txt b/src/helios/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.helios)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/hufosmoke/CMakeLists.txt b/src/hufosmoke/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.hufosmoke)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/hufotunnel/CMakeLists.txt b/src/hufotunnel/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.hufotunnel)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/hyperspace/CMakeLists.txt b/src/hyperspace/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.hyperspace)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/lattice/CMakeLists.txt b/src/lattice/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.lattice)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/lorenz/CMakeLists.txt b/src/lorenz/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.lorenz)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/matrixview/CMakeLists.txt b/src/matrixview/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.matrixview)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/microcosm/CMakeLists.txt b/src/microcosm/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.microcosm)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.plasma)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/skyrocket/CMakeLists.txt b/src/skyrocket/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.skyrocket)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/solarwinds/CMakeLists.txt b/src/solarwinds/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.solarwinds)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/spirographx/CMakeLists.txt b/src/spirographx/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.spirographx)
 
 message(STATUS "--------------------------------------------------------------------------------")
diff --git a/src/sundancer2/CMakeLists.txt b/src/sundancer2/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...4.0)
 project(screensaver.rsxs.sundancer2)
 
 message(STATUS "--------------------------------------------------------------------------------")

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cmake_minimum_required(VERSION 3.5)`
	`1`	`+cmake_minimum_required(VERSION 3.5...4.0)`
`2`	`2`	`project(screensavers.rsxs)`
`3`	`3`
`4`	`4`	`set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cmake_minimum_required(VERSION 3.0)`
	`1`	`+cmake_minimum_required(VERSION 3.5...4.0)`
`2`	`2`
`3`	`3`	`project(Implicit)`
`4`	`4`