CMake: replace DownloadProject with FetchContent

timsort · Jan 17, 2024 · dd31776 · dd31776
1 parent e59cdd3
commit dd31776
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 208 deletions.
diff --git a/cmake/DownloadProject.CMakeLists.cmake.in b/cmake/DownloadProject.CMakeLists.cmake.in
diff --git a/cmake/DownloadProject.cmake b/cmake/DownloadProject.cmake
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,21 +1,26 @@
 # Copyright (c) 2019-2024 Morwenn
 # SPDX-License-Identifier: MIT
 
-include(DownloadProject)
+cmake_minimum_required(VERSION 3.24.0)
 
-# Download and configure Catch2 for the tests
-download_project(PROJ Catch2
-                 GIT_REPOSITORY https://github.com/catchorg/Catch2
-                 GIT_TAG v3.5.2
-                 UPDATE_DISCONNECTED 1
-)
-add_subdirectory(${Catch2_SOURCE_DIR} ${Catch2_BINARY_DIR})
-list(APPEND CMAKE_MODULE_PATH ${Catch2_SOURCE_DIR}/extras)
+include(FetchContent)
 
 # Test suite options
 option(GFX_TIMSORT_USE_VALGRIND "Whether to run the tests with Valgrind" OFF)
 set(GFX_TIMSORT_SANITIZE "" CACHE STRING "Comma-separated list of options to pass to -fsanitize")
 
+# Find/download Catch2
+FetchContent_Declare(
+    Catch2
+    GIT_REPOSITORY https://github.com/catchorg/Catch2
+    GIT_TAG v3.5.0
+    SYSTEM
+    FIND_PACKAGE_ARGS 3.1.0
+)
+FetchContent_MakeAvailable(Catch2)
+list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
+include(Catch)
+
 # Configure Valgrind
 if (${GFX_TIMSORT_USE_VALGRIND})
     find_program(MEMORYCHECK_COMMAND valgrind)