Support CMake 3.28 and retain support for earlier versions

DanielaE · Oct 29, 2023 · dac98d4 · dac98d4
1 parent 1de9492
commit dac98d4
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 21 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,19 +10,18 @@ project(CppInAction
         LANGUAGES CXX
 )
 
-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.27)
-  set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "aa1f7df0-828a-4fcd-9afc-2dc80491aca7")
-else ()
-  set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "2182bf5c-ef0d-489a-91da-49dbc3090d2a")
+if (CMAKE_VERSION VERSION_LESS 3.28)
+  if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.27)
+    set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "aa1f7df0-828a-4fcd-9afc-2dc80491aca7")
+  else ()
+    set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "2182bf5c-ef0d-489a-91da-49dbc3090d2a")
+  endif()
+  set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
+else()
+  cmake_policy(VERSION 3.28)
 endif()
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
 set(CMAKE_CXX_EXTENSIONS OFF)
-
-if (MSVC)
-  set(CMAKE_CXX_STANDARD 23)
-elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  set(CMAKE_CXX_STANDARD 23)
-endif()
+set(CMAKE_CXX_STANDARD 23)
 
 add_subdirectory(argparse)
 add_subdirectory(asio)

diff --git a/Demo-App/CMakeLists.txt b/Demo-App/CMakeLists.txt
@@ -9,12 +9,16 @@ project(std
         LANGUAGES CXX
 )
 
-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.27)
-  set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "aa1f7df0-828a-4fcd-9afc-2dc80491aca7")
-else ()
-  set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "2182bf5c-ef0d-489a-91da-49dbc3090d2a")
+if (CMAKE_VERSION VERSION_LESS 3.28)
+  if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.27)
+    set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "aa1f7df0-828a-4fcd-9afc-2dc80491aca7")
+  else ()
+    set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "2182bf5c-ef0d-489a-91da-49dbc3090d2a")
+  endif()
+  set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
+else()
+  cmake_policy(VERSION 3.28)
 endif()
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CXX_STANDARD_REQUIRED ON)
 

diff --git a/SDL b/SDL
diff --git a/argparse b/argparse
diff --git a/asio b/asio
diff --git a/libav b/libav
diff --git a/stl b/stl