使用 CMake 3.28 简化 CMakeLists.txt

.github/workflows/check.yaml

@@ -64,6 +64,7 @@ jobs:
 
   linux:
     strategy:
+      fail-fast: false
       matrix:
         image:
         - "debian:12"

.github/workflows/release.yaml

@@ -108,6 +108,7 @@ jobs:
 
   deb:
     strategy:
+      fail-fast: false
       matrix:
         image:
         - "debian:12"

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.18.4)
 
-project(candy LANGUAGES C CXX VERSION 5.10.0)
+project(candy LANGUAGES C CXX VERSION 5.10.1)
 
 option(CANDY_NOEXE  "Don't build executable")
 option(CANDY_DEVEL  "Build development library")
@@ -17,6 +17,31 @@ if (${CANDY_STATIC})
     set(CANDY_STATIC_POCO 1)
 endif()
 
+macro(Fetch NAME GIT_REPOSITORY GIT_TAG)
+    include(FetchContent)
+    if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.28")
+        FetchContent_Declare(
+            ${NAME}
+            GIT_REPOSITORY ${GIT_REPOSITORY}
+            GIT_TAG        ${GIT_TAG}
+            EXCLUDE_FROM_ALL
+        )
+        FetchContent_MakeAvailable(${NAME})
+    else()
+        FetchContent_Declare(
+            ${NAME}
+            GIT_REPOSITORY ${GIT_REPOSITORY}
+            GIT_TAG        ${GIT_TAG}
+        )
+        FetchContent_GetProperties(${NAME})
+        if(NOT ${NAME}_POPULATED)
+            FetchContent_Populate(${NAME})
+            add_subdirectory(${${NAME}_SOURCE_DIR} ${${NAME}_BINARY_DIR} EXCLUDE_FROM_ALL)
+        endif()
+    endif()
+endmacro()
+
+
 if (${CANDY_STATIC_OPENSSL})
     execute_process(
         COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/openssl
@@ -61,31 +86,11 @@ if (${CANDY_STATIC_OPENSSL})
 endif()
 
 if (${CANDY_STATIC_FMT})
-    include(FetchContent)
-    FetchContent_Declare(
-        fmt
-        GIT_REPOSITORY  https://github.com/fmtlib/fmt.git
-        GIT_TAG         10.2.1
-    )
-    FetchContent_GetProperties(fmt)
-    if(NOT fmt_POPULATED)
-        FetchContent_Populate(fmt)
-        add_subdirectory(${fmt_SOURCE_DIR} ${fmt_BINARY_DIR} EXCLUDE_FROM_ALL)
-    endif()
+    Fetch(fmt "https://github.com/fmtlib/fmt.git" "10.2.1")
 endif()
 
 if (${CANDY_STATIC_SPDLOG})
-    include(FetchContent)
-    FetchContent_Declare(
-        spdlog
-        GIT_REPOSITORY https://github.com/gabime/spdlog.git
-        GIT_TAG        v1.14.1
-    )
-    FetchContent_GetProperties(spdlog)
-    if(NOT spdlog_POPULATED)
-        FetchContent_Populate(spdlog)
-        add_subdirectory(${spdlog_SOURCE_DIR} ${spdlog_BINARY_DIR} EXCLUDE_FROM_ALL)
-    endif()
+    Fetch(spdlog "https://github.com/gabime/spdlog.git" "v1.14.1")
 endif()
 
 if (${CANDY_STATIC_POCO})
@@ -104,17 +109,7 @@ if (${CANDY_STATIC_POCO})
     set(ENABLE_ACTIVERECORD_COMPILER OFF CACHE BOOL "" FORCE)
     set(ENABLE_ZIP OFF CACHE BOOL "" FORCE)
     set(ENABLE_JWT OFF CACHE BOOL "" FORCE)
-    include(FetchContent)
-    FetchContent_Declare(
-        poco
-        GIT_REPOSITORY "https://github.com/pocoproject/poco.git"
-        GIT_TAG        "poco-1.13.3-release"
-    )
-    FetchContent_GetProperties(poco)
-    if(NOT poco_POPULATED)
-        FetchContent_Populate(poco)
-        add_subdirectory(${poco_SOURCE_DIR} ${poco_BINARY_DIR} EXCLUDE_FROM_ALL)
-    endif()
+    Fetch(poco "https://github.com/pocoproject/poco.git" "poco-1.13.3-release")
 endif()
 
 set(CANDY_EXECUTE_NAME "candy")