SciCompMod · reneSchm · Apr 7, 2026 · Apr 7, 2026 · Apr 7, 2026 · Apr 8, 2026
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.13)
+set(MEMILIO_CMAKE_MINIMUM_VERSION "3.18.0")
+cmake_minimum_required(VERSION ${MEMILIO_CMAKE_MINIMUM_VERSION})
 
 project(memilio VERSION 1.0.0)
 

diff --git a/cpp/benchmarks/CMakeLists.txt b/cpp/benchmarks/CMakeLists.txt
@@ -5,18 +5,13 @@ set(BENCHMARK_ENABLE_INSTALL OFF CACHE BOOL "Don't install benchmark" FORCE)
 set(BENCHMARK_DOWNLOAD_DEPENDENCIES OFF CACHE BOOL "Don't download dependencies" FORCE)
 set(BENCHMARK_ENABLE_GTEST_TESTS OFF CACHE BOOL "Disable Google Test in benchmark" FORCE)
 
+message(STATUS "Downloading GoogleBenchmark library")
 include(FetchContent)
 FetchContent_Declare(benchmark
+    SOURCE_SUBDIR this_directory_name_does_not_exist
     GIT_REPOSITORY https://github.com/google/benchmark.git
     GIT_TAG v1.6.1)
-FetchContent_GetProperties(benchmark)
-
-if(NOT benchmark_POPULATED)
-    FetchContent_Populate(benchmark)
-    set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE BOOL "")
-    add_subdirectory(${benchmark_SOURCE_DIR} ${benchmark_BINARY_DIR} EXCLUDE_FROM_ALL)
-    unset(CMAKE_SUPPRESS_DEVELOPER_WARNINGS)
-endif()
+FetchContent_MakeAvailable(benchmark)
 
 set_target_properties(benchmark PROPERTIES FOLDER "Extern")
 

diff --git a/cpp/cmake/DownloadProject.CMakeLists.cmake.in b/cpp/cmake/DownloadProject.CMakeLists.cmake.in
diff --git a/cpp/cmake/DownloadProject.cmake b/cpp/cmake/DownloadProject.cmake
diff --git a/cpp/cmake/FindSphinx.cmake b/cpp/cmake/FindSphinx.cmake
diff --git a/cpp/memilio/ad/CMakeLists.txt b/cpp/memilio/ad/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.5...${MEMILIO_CMAKE_MINIMUM_VERSION})
 project(AD CXX)
 
 add_library(AD INTERFACE)

diff --git a/cpp/tests/cmake/AddGoogleTest.cmake b/cpp/tests/cmake/AddGoogleTest.cmake
@@ -6,35 +6,12 @@
 #
 set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 
-if(CMAKE_VERSION VERSION_LESS 3.11)
-    set(UPDATE_DISCONNECTED_IF_AVAILABLE "UPDATE_DISCONNECTED 1")
-
-    include(DownloadProject)
-    download_project(PROJ googletest
-        GIT_REPOSITORY https://github.com/google/googletest.git
-        GIT_TAG v1.16.0
-        UPDATE_DISCONNECTED 1
-        QUIET
-    )
-
-    # CMake warning suppression will not be needed in version 1.9
-    set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE BOOL "")
-    add_subdirectory(${googletest_SOURCE_DIR} ${googletest_SOURCE_DIR} EXCLUDE_FROM_ALL)
-    unset(CMAKE_SUPPRESS_DEVELOPER_WARNINGS)
-else()
-    include(FetchContent)
-    FetchContent_Declare(googletest
-        GIT_REPOSITORY https://github.com/google/googletest.git
-        GIT_TAG v1.16.0)
-    FetchContent_GetProperties(googletest)
-
-    if(NOT googletest_POPULATED)
-        FetchContent_Populate(googletest)
-        set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE BOOL "")
-        add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
-        unset(CMAKE_SUPPRESS_DEVELOPER_WARNINGS)
-    endif()
-endif()
+message(STATUS "Downloading GoogleTest library")
+include(FetchContent)
+FetchContent_Declare(googletest
+    GIT_REPOSITORY https://github.com/google/googletest.git
+    GIT_TAG v1.16.0)
+FetchContent_MakeAvailable(googletest)
 
 if(CMAKE_CONFIGURATION_TYPES)
     add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}
@@ -47,34 +24,16 @@ endif()
 
 set_target_properties(check PROPERTIES FOLDER "Scripts")
 
-# include_directories(${gtest_SOURCE_DIR}/include)
-
-# More modern way to do the last line, less messy but needs newish CMake:
-# target_include_directories(gtest INTERFACE ${gtest_SOURCE_DIR}/include)
-if(GOOGLE_TEST_INDIVIDUAL)
-    if(NOT CMAKE_VERSION VERSION_LESS 3.9)
-        include(GoogleTest)
-    else()
-        set(GOOGLE_TEST_INDIVIDUAL OFF)
-    endif()
-endif()
-
 # Target must already exist
 macro(add_gtest TESTNAME)
     target_link_libraries(${TESTNAME} PUBLIC gtest gmock gtest_main)
 
-    if(GOOGLE_TEST_INDIVIDUAL)
-        if(CMAKE_VERSION VERSION_LESS 3.10)
-            gtest_add_tests(TARGET ${TESTNAME}
-                TEST_PREFIX "${TESTNAME}."
-                TEST_LIST TmpTestList)
-            set_tests_properties(${TmpTestList} PROPERTIES FOLDER "Tests")
-        else()
-            gtest_discover_tests(${TESTNAME}
-                TEST_PREFIX "${TESTNAME}."
-                PROPERTIES FOLDER "Tests"
-                DISCOVERY_TIMEOUT 30)
-        endif()
+    if(GOOGLE_TEST_INDIVIDUAL)    
+        include(GoogleTest)
+        gtest_discover_tests(${TESTNAME}
+            TEST_PREFIX "${TESTNAME}."
+            PROPERTIES FOLDER "Tests"
+            DISCOVERY_TIMEOUT 30)
     else()
         add_test(${TESTNAME} ${TESTNAME})
         set_target_properties(${TESTNAME} PROPERTIES FOLDER "Tests")

diff --git a/cpp/tests/cmake/DownloadProject.CMakeLists.cmake.in b/cpp/tests/cmake/DownloadProject.CMakeLists.cmake.in