Merge pull request #273 from FeignClaims/fix/replace_deprecated_populate

aminya · Sep 3, 2024 · 5b95e86 · 5b95e86
2 parents 6df0ec6 + 5e1bddd
commit 5b95e86
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/CrossCompiler.cmake b/src/CrossCompiler.cmake
@@ -357,11 +357,13 @@ macro(enable_cross_compiler)
       if(NOT DEFINED EMSCRIPTEN_ROOT)
         include(FetchContent)
         message(STATUS "fetch emscripten repo main branch. ...")
-        FetchContent_Declare(
-          emscripten GIT_REPOSITORY https://github.com/emscripten-core/emscripten GIT_TAG main
+        FetchContent_Declare(emscripten
+          GIT_REPOSITORY https://github.com/emscripten-core/emscripten
+          GIT_TAG main
+          SOURCE_SUBDIR this-directory-does-not-exist
         )
         if(NOT emscripten_POPULATED)
-          FetchContent_Populate(emscripten)
+          FetchContent_MakeAvailable(emscripten)
           set(EMSCRIPTEN_ROOT "${emscripten_SOURCE_DIR}")
         endif()
       endif()

diff --git a/src/PackageProject.cmake b/src/PackageProject.cmake
@@ -266,12 +266,13 @@ function(package_project)
   )
 
   # download ForwardArguments
-  FetchContent_Declare(
-    _fargs URL https://github.com/polysquare/cmake-forward-arguments/archive/refs/tags/v1.0.0.zip
+  FetchContent_Declare(_fargs
+    URL https://github.com/polysquare/cmake-forward-arguments/archive/refs/tags/v1.0.0.zip
+    SOURCE_SUBDIR this-directory-does-not-exist
   )
   FetchContent_GetProperties(_fargs)
   if(NOT _fargs_POPULATED)
-    FetchContent_Populate(_fargs)
+    FetchContent_MakeAvailable(_fargs)
   endif()
   include("${_fargs_SOURCE_DIR}/ForwardArguments.cmake")
 
@@ -289,10 +290,13 @@ function(package_project)
   )
 
   # download ycm
-  FetchContent_Declare(_ycm URL https://github.com/robotology/ycm/archive/refs/tags/v0.13.0.zip)
+  FetchContent_Declare(_ycm
+    URL https://github.com/robotology/ycm/archive/refs/tags/v0.13.0.zip
+    SOURCE_SUBDIR this-directory-does-not-exist
+  )
   FetchContent_GetProperties(_ycm)
   if(NOT _ycm_POPULATED)
-    FetchContent_Populate(_ycm)
+    FetchContent_MakeAvailable(_ycm)
   endif()
   include("${_ycm_SOURCE_DIR}/modules/InstallBasicPackageFiles.cmake")