refactor: always use *_Populate to reduce code paths

cpm-cmake · Jul 19, 2024 · 0e8ca2a · 0e8ca2a
1 parent 6f2cf67
commit 0e8ca2a
Showing 1 changed file with 12 additions and 59 deletions.
diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake
@@ -862,38 +862,11 @@ function(CPMAddPackage)
   )
 
   if(NOT CPM_SKIP_FETCH)
-    # CMake 3.28 added EXCLUDE, SYSTEM (3.25), and SOURCE_SUBDIR (3.18) to FetchContent_Declare.
-    # Calling FetchContent_MakeAvailable will then internally forward these options to
-    # add_subdirectory. Up until these changes, we had to call FetchContent_Populate and
-    # add_subdirectory separately, which is no longer necessary and has been deprecated as of 3.30.
-    set(fetchContentDeclareExtraArgs "")
-    if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.28.0")
-      if(${CPM_ARGS_EXCLUDE_FROM_ALL})
-        list(APPEND fetchContentDeclareExtraArgs EXCLUDE_FROM_ALL)
-      endif()
-      if(${CPM_ARGS_SYSTEM})
-        list(APPEND fetchContentDeclareExtraArgs SYSTEM)
-      endif()
-      if(DEFINED CPM_ARGS_SOURCE_SUBDIR)
-        list(APPEND fetchContentDeclareExtraArgs SOURCE_SUBDIR ${CPM_ARGS_SOURCE_SUBDIR})
-      endif()
-      # For CMake version <3.28 OPTIONS are parsed in cpm_add_subdirectory
-      if(CPM_ARGS_OPTIONS AND NOT DOWNLOAD_ONLY)
-        foreach(OPTION ${CPM_ARGS_OPTIONS})
-          cpm_parse_option("${OPTION}")
-          set(${OPTION_KEY} "${OPTION_VALUE}")
-        endforeach()
-      endif()
-    endif()
-    cpm_declare_fetch(
-      "${CPM_ARGS_NAME}" ${fetchContentDeclareExtraArgs} "${CPM_ARGS_UNPARSED_ARGUMENTS}"
-    )
-
-    cpm_fetch_package("${CPM_ARGS_NAME}" ${DOWNLOAD_ONLY} populated ${CPM_ARGS_UNPARSED_ARGUMENTS})
+    cpm_fetch_package("${CPM_ARGS_NAME}" populated ${CPM_ARGS_UNPARSED_ARGUMENTS})
     if(CPM_SOURCE_CACHE AND download_directory)
       file(LOCK ${download_directory}/../cmake.lock RELEASE)
     endif()
-    if(${populated} AND ${CMAKE_VERSION} VERSION_LESS "3.28.0")
+    if(${populated})
       cpm_add_subdirectory(
         "${CPM_ARGS_NAME}"
         "${DOWNLOAD_ONLY}"
@@ -1003,17 +976,7 @@ function(CPMGetPackageVersion PACKAGE OUTPUT)
   )
 endfunction()
 
-# declares a package in FetchContent_Declare
-function(cpm_declare_fetch PACKAGE)
-  if(${CPM_DRY_RUN})
-    cpm_message(STATUS "${CPM_INDENT} Package not declared (dry run)")
-    return()
-  endif()
-
-  FetchContent_Declare(${PACKAGE} ${ARGN})
-endfunction()
-
-# returns properties for a package previously defined by cpm_declare_fetch
+# returns properties for a package previously defined by cpm_fetch_package
 function(cpm_get_fetch_properties PACKAGE)
   if(${CPM_DRY_RUN})
     return()
@@ -1080,7 +1043,7 @@ endfunction()
 
 # downloads a previously declared package via FetchContent and exports the variables
 # `${PACKAGE}_SOURCE_DIR` and `${PACKAGE}_BINARY_DIR` to the parent scope
-function(cpm_fetch_package PACKAGE DOWNLOAD_ONLY populated)
+function(cpm_fetch_package PACKAGE populated)
   set(${populated}
       FALSE
       PARENT_SCOPE
@@ -1095,24 +1058,14 @@ function(cpm_fetch_package PACKAGE DOWNLOAD_ONLY populated)
   string(TOLOWER "${PACKAGE}" lower_case_name)
 
   if(NOT ${lower_case_name}_POPULATED)
-    if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.28.0")
-      if(DOWNLOAD_ONLY)
-        # MakeAvailable will call add_subdirectory internally which is not what we want when
-        # DOWNLOAD_ONLY is set. Populate will only download the dependency without adding it to the
-        # build
-        FetchContent_Populate(
-          ${PACKAGE}
-          SOURCE_DIR "${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-src"
-          BINARY_DIR "${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-build"
-          SUBBUILD_DIR "${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-subbuild"
-          ${ARGN}
-        )
-      else()
-        FetchContent_MakeAvailable(${PACKAGE})
-      endif()
-    else()
-      FetchContent_Populate(${PACKAGE})
-    endif()
+    FetchContent_Populate(
+      ${PACKAGE}
+      QUIET
+      SOURCE_DIR "${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-src"
+      BINARY_DIR "${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-build"
+      SUBBUILD_DIR "${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-subbuild"
+      ${ARGN}
+    )
     set(${populated}
         TRUE
         PARENT_SCOPE