CMake: Replace FetchContent_Populate

In CMake superbuilds, `FetchContent_Populate` is now deprecated. Use `FetchContent_MakeAvailable` instead.
AMReX-Codes · Aug 30, 2024 · e486292 · e486292
1 parent 608c2aa
commit e486292
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 34 deletions.
diff --git a/ExampleCodes/CMakeLists.txt b/ExampleCodes/CMakeLists.txt
@@ -59,14 +59,13 @@ if( NOT DEFINED AMReX_DIR )
        GIT_TAG        ${AMReX_GIT_BRANCH}
        )
 
-   if(NOT ${amrex}_POPULATED)
-       FetchContent_Populate(amrex)
+   FetchContent_MakeAvailable(amrex)
 
-       list(APPEND CMAKE_MODULE_PATH ${amrex_SOURCE_DIR}/Tools/CMake)
+   list(APPEND CMAKE_MODULE_PATH ${amrex_SOURCE_DIR}/Tools/CMake)
 
-       # Load amrex options here so that they are
-       # available to the entire project
-       include(AMReXOptions)
+   # Load amrex options here so that they are
+   # available to the entire project
+   include(AMReXOptions)
 
 if( AMReX_SUNDIALS )
 if( NOT DEFINED SUNDIALS_DIR )
@@ -85,8 +84,7 @@ if( NOT DEFINED SUNDIALS_DIR )
        GIT_TAG        ${SUNDIALS_GIT_BRANCH}
        )
 
-   if(NOT ${sundials}_POPULATED)
-       FetchContent_Populate(sundials)
+   FetchContent_MakeAvailable(sundials)
 #       set(SUNDIALS_DIR ${sundials_SOURCE_DIR})
    # Set build options for subproject
    set(EXAMPLES_ENABLE_C            OFF                        CACHE INTERNAL "" )
@@ -119,7 +117,7 @@ if( NOT DEFINED SUNDIALS_DIR )
    set(BUILD_IDA                    OFF                        CACHE INTERNAL "" )
    set(BUILD_IDAS                   OFF                        CACHE INTERNAL "" )
    set(BUILD_CVODES                 OFF                        CACHE INTERNAL "" )
-endif ()
+
    list(APPEND CMAKE_MODULE_PATH ${sundials_SOURCE_DIR})
 
 #  Add  SUNDIALS sources to the build
@@ -159,7 +157,6 @@ else ()
    endif ()
 
    set(SUNDIALS_FOUND TRUE)
-endif ()
 endif ()
        if(AMReX_FORTRAN)
           enable_language(Fortran)
@@ -211,10 +208,7 @@ if(TUTORIAL_PYTHON)
            GIT_TAG        ${pyAMReX_GIT_BRANCH}
            )
 
-       if(NOT fetchedpyamrex_POPULATED)
-           FetchContent_Populate(fetchedpyamrex)
-           add_subdirectory(${fetchedpyamrex_SOURCE_DIR} ${fetchedpyamrex_BINARY_DIR})
-       endif()
+       FetchContent_MakeAvailable(fetchedpyamrex)
     endif()
 endif()
 

diff --git a/GuidedTutorials/HeatEquation/Exec/CMakeLists.txt b/GuidedTutorials/HeatEquation/Exec/CMakeLists.txt
@@ -57,11 +57,7 @@ if(NOT DEFINED AMReX_ROOT)
     GIT_TAG        origin/development
     )
 
-  FetchContent_Populate(amrex_code)
-
-  # CMake will read the files in these directories and configure, build
-  # and install AMReX.
-  add_subdirectory(${amrex_code_SOURCE_DIR} ${amrex_code_BINARY_DIR})
+  FetchContent_MakeAvailable(amrex_code)
 
 else()
 

diff --git a/GuidedTutorials/HeatEquation_Simple/CMakeLists.txt b/GuidedTutorials/HeatEquation_Simple/CMakeLists.txt
@@ -49,11 +49,7 @@ if(NOT DEFINED AMReX_ROOT)
     GIT_TAG        origin/development
     )
 
-  FetchContent_Populate(amrex_code)
-
-  # CMake will read the files in these directories to configure, build
-  # and install AMReX.
-  add_subdirectory(${amrex_code_SOURCE_DIR} ${amrex_code_BINARY_DIR})
+  FetchContent_MakeAvailable(amrex_code)
 
 else()
 

diff --git a/GuidedTutorials/HelloWorld/CMakeLists.txt b/GuidedTutorials/HelloWorld/CMakeLists.txt
@@ -53,11 +53,7 @@ if(NOT DEFINED AMReX_ROOT)
     GIT_TAG        origin/development
     )
 
-  FetchContent_Populate(amrex_code)
-
-  # CMake will read the files in these directories and configure, build
-  # and install AMReX.
-  add_subdirectory(${amrex_code_SOURCE_DIR} ${amrex_code_BINARY_DIR})
+  FetchContent_MakeAvailable(amrex_code)
 
 else()
 

diff --git a/GuidedTutorials/MultiFab/CMakeLists.txt b/GuidedTutorials/MultiFab/CMakeLists.txt
@@ -53,11 +53,7 @@ if(NOT DEFINED AMReX_ROOT)
     GIT_TAG        origin/development
     )
 
-  FetchContent_Populate(amrex_code)
-
-  # CMake will read the files in these directories and configure, build
-  # and install AMReX.
-  add_subdirectory(${amrex_code_SOURCE_DIR} ${amrex_code_BINARY_DIR})
+  FetchContent_MakeAvailable(amrex_code)
 
 else()