CMake version bumps and cleanup

nmwsharp · Feb 6, 2022 · 8ca660a · 8ca660a
1 parent a6b7ecf
commit 8ca660a
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...3.22)
 
 project(polyscope)
 

diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.5)
-
 if("${POLYSCOPE_BACKEND_OPENGL3_GLFW}")
 
   ## Glad

diff --git a/deps/glad/CMakeLists.txt b/deps/glad/CMakeLists.txt
@@ -1,3 +1 @@
-cmake_minimum_required(VERSION 3.1)
-
 add_subdirectory(src)
diff --git a/deps/stb/CMakeLists.txt b/deps/stb/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.1)
-
 # Create a library for the viewer code
 add_library(
     stb 

diff --git a/examples/demo-app/CMakeLists.txt b/examples/demo-app/CMakeLists.txt
@@ -1,4 +1,6 @@
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 2.8.9...3.22)
+
+project(polyscope-demo-app)
 
 # Maybe stop from CMAKEing in the wrong place
 if (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.1)
-
 # Maybe stop from CMAKEing in the wrong place
 if (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)
     message(FATAL_ERROR "Source and build directories cannot be the same. Go use the /build directory.")

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10.0)
+cmake_minimum_required(VERSION 3.10.0...3.22)
 
 # Set up testing
 enable_testing()

diff --git a/test/CMakeLists.txt.in b/test/CMakeLists.txt.in
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.2)
+cmake_minimum_required(VERSION 2.8.2...3.22)
 
 project(googletest-download NONE)
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1 @@
		cmake_minimum_required(VERSION 3.1)

		add_subdirectory(src)