CMake: Replace FetchContent_Populate

In CMake superbuilds, `FetchContent_Populate` is now deprecated.
Use `FetchContent_MakeAvailable` instead.

ExampleCodes/CMakeLists.txt

@@ -59,14 +59,14 @@ if( NOT DEFINED AMReX_DIR )
  GIT_TAG ${AMReX_GIT_BRANCH}
  )
 
- if(NOT ${amrex}_POPULATED)
-  FetchContent_Populate(amrex)
+if(NOT ${amrex}_POPULATED)
+ 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 )
@@ -86,7 +86,7 @@ if( NOT DEFINED SUNDIALS_DIR )
  )
 
  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 "" )
@@ -122,9 +122,6 @@ if( NOT DEFINED SUNDIALS_DIR )
 endif ()
  list(APPEND CMAKE_MODULE_PATH ${sundials_SOURCE_DIR})
 
-# Add SUNDIALS sources to the build
- add_subdirectory(${sundials_SOURCE_DIR})
-
  # This is to use the same target name uses by the sundials exported targets
  add_library(SUNDIALS::cvode ALIAS sundials_cvode_static)
  add_library(SUNDIALS::arkode ALIAS sundials_arkode_static)
@@ -172,9 +169,6 @@ endif ()
  include(AMReX_SetupCUDA)
  endif()
  endif()
-
- # Bring the populated content into the build
- add_subdirectory(${amrex_SOURCE_DIR} ${amrex_BINARY_DIR})
  endif()
 else()
  message(STATUS "Using existing AMReX library")
@@ -210,10 +204,8 @@ if(TUTORIAL_PYTHON)
  GIT_REPOSITORY ${pyAMReX_GIT_REPO}
  GIT_TAG ${pyAMReX_GIT_BRANCH}
  )
-
  if(NOT fetchedpyamrex_POPULATED)
- FetchContent_Populate(fetchedpyamrex)
- add_subdirectory(${fetchedpyamrex_SOURCE_DIR} ${fetchedpyamrex_BINARY_DIR})
+ FetchContent_MakeAvailable(fetchedpyamrex)
  endif()
  endif()
 endif()

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()
 

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()
 

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()
 

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()