fix doctest path resolve if system package used

Author: e-gleba

CMakeLists.txt

@@ -14,7 +14,6 @@ list(
     ${CMAKE_CURRENT_LIST_DIR}/cmake/pkg
     ${CMAKE_CURRENT_LIST_DIR}/cmake/utils)
 
-# Android: only extend CMAKE_FIND_ROOT_PATH if cross-compiling
 if(CMAKE_CROSSCOMPILING)
     list(
         APPEND
@@ -32,11 +31,11 @@ option(ENABLE_DEV_TOOLS "Enable dev tools like clang-format, clang-tidy, etc."
        OFF)
 
 if(ENABLE_DEV_TOOLS)
-    find_package(clang_format CONFIG QUIET)
-    find_package(clang_tidy CONFIG QUIET)
-    find_package(clang_doc CONFIG QUIET)
-    find_package(cpplint CONFIG QUIET)
-    find_package(doxygen CONFIG QUIET)
+    find_package(clang_format CONFIG REQUIRED)
+    find_package(clang_tidy CONFIG REQUIRED)
+    find_package(clang_doc CONFIG REQUIRED)
+    find_package(cpplint CONFIG REQUIRED)
+    find_package(doxygen CONFIG REQUIRED)
 
     # Optional: fail if critical tools missing in dev mode?
     # mark_as_advanced(...)  # hide from GUI if desired

cmake/cpm-config.cmake

@@ -3,23 +3,28 @@
 # SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors
 
 set(CPM_DOWNLOAD_VERSION 0.42.0)
-set(CPM_HASH_SUM "2020b4fc42dba44817983e06342e682ecfc3d2f484a581f11cc5731fbe4dce8a")
+set(CPM_HASH_SUM
+    "2020b4fc42dba44817983e06342e682ecfc3d2f484a581f11cc5731fbe4dce8a")
 
 if(CPM_SOURCE_CACHE)
-  set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+    set(CPM_DOWNLOAD_LOCATION
+        "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
 elseif(DEFINED ENV{CPM_SOURCE_CACHE})
-  set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+    set(CPM_DOWNLOAD_LOCATION
+        "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
 else()
-  set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
+    set(CPM_DOWNLOAD_LOCATION
+        "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
 endif()
 
 # Expand relative path. This is important if the provided path contains a tilde (~)
 get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE)
 
-file(DOWNLOAD
-     https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
-     ${CPM_DOWNLOAD_LOCATION} EXPECTED_HASH SHA256=${CPM_HASH_SUM}
-)
+file(
+    DOWNLOAD
+    https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
+    ${CPM_DOWNLOAD_LOCATION}
+    EXPECTED_HASH SHA256=${CPM_HASH_SUM})
 
 include(${CPM_DOWNLOAD_LOCATION})
 

cmake/cpm/doctest-config.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28)
+cmake_minimum_required(VERSION 3.30)
 
 cpmaddpackage(
     NAME
@@ -8,13 +8,22 @@ cpmaddpackage(
     VERSION
     2.4.12
     SYSTEM
-    YES
+    ON
     GIT_SHALLOW
-    TRUE
+    ON
     OPTIONS
     "DOCTEST_WITH_TESTS OFF"
     "DOCTEST_WITH_MAIN_IN_STATIC_LIB OFF"
     "DOCTEST_NO_INSTALL ON"
     "DOCTEST_USE_STD_HEADERS ON")
 
-include(${doctest_SOURCE_DIR}/scripts/cmake/doctest.cmake)
+if(doctest_ADDED)
+    set(doctest_cmake_path "${doctest_SOURCE_DIR}/scripts/cmake")
+    set(doctest_source "downloaded")
+else()
+    set(doctest_cmake_path "${doctest_DIR}")
+    set(doctest_source "system")
+endif()
+
+list(APPEND CMAKE_MODULE_PATH "${doctest_cmake_path}")
+message(STATUS "doctest (${doctest_source}) -> '${doctest_cmake_path}'")

cmake/cpm/sdl3-config.cmake

@@ -8,16 +8,26 @@ cpmaddpackage(
     GIT_TAG
     a96677bdf6b4acb84af4ec294e5f60a4e8cbbe03
     SYSTEM
-    YES
+    ON
     GIT_SHALLOW
-    TRUE
+    ON
     OPTIONS
+    # Core library config - fast shared build
     "SDL_STATIC
     OFF"
     "SDL_SHARED
     ON"
+    # Performance optimizations
     "SDL_CCACHE
     ON"
+    "CMAKE_BUILD_TYPE RelWithDebInfo"
+    # Disable unnecessary features for speed
+    "SDL_TEST_LIBRARY OFF"
+    "SDL_TESTS OFF"
+    "SDL_EXAMPLES OFF"
+    "SDL_INSTALL_TESTS OFF"
+    "SDL_DISABLE_INSTALL_DOCS ON"
+    # Platform optimizations (Linux/Wayland focused)
     "SDL_X11
     OFF"
     "SDL_WAYLAND
@@ -27,9 +37,4 @@ cpmaddpackage(
     "SDL_RENDER_VULKAN
     OFF"
     "SDL_ASSEMBLY
-    OFF"
-    "SDL_TEST_LIBRARY
-    OFF"
-    "SDL_TESTS
-    OFF
-    ")
+    OFF")

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.28)
+cmake_minimum_required(VERSION 3.30)
 
 add_executable(cli_app main.cpp)
 target_link_libraries(cli_app PRIVATE warnings)

tests/CMakeLists.txt

@@ -40,7 +40,6 @@ target_compile_definitions(
     )
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux|Windows|Darwin")
-    # TODO: make it explicit, without in cpm auto call
-    # include(doctest)
+    include(doctest)
     doctest_discover_tests(tests)
 endif()