[eclipse-iceoryx#264] Use FetchContent_MakeAvailable

elBoberido · Jul 5, 2024 · 10f0ada · 10f0ada
1 parent dcbc800
commit 10f0ada
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/iceoryx2-ffi/c/tests/cmake/googletest.cmake b/iceoryx2-ffi/c/tests/cmake/googletest.cmake
@@ -13,14 +13,14 @@
 include(FetchContent)
 
 FetchContent_Declare(
-  googletest
-  GIT_REPOSITORY https://github.com/google/googletest.git
-  GIT_TAG        v1.14.0
-  EXCLUDE_FROM_ALL
+    googletest
+    GIT_REPOSITORY https://github.com/google/googletest.git
+    GIT_TAG        v1.14.0
+    EXCLUDE_FROM_ALL
 )
 
 FetchContent_GetProperties(googletest)
 if(NOT googletest_POPULATED)
-  FetchContent_Populate(googletest)
-  add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
+    message(STATUS "googletest not found! Using FetchContent!")
 endif()
+FetchContent_MakeAvailable(googletest)
diff --git a/iceoryx2-ffi/cxx/cmake/fetch-iceoryx-hoofs.cmake b/iceoryx2-ffi/cxx/cmake/fetch-iceoryx-hoofs.cmake
@@ -34,9 +34,9 @@ if(NOT iceoryx_platform_FOUND OR NOT iceoryx_hoofs_FOUND)
     )
     FetchContent_GetProperties(iceoryx)
     if (NOT iceoryx_POPULATED)
-        message(STATUS "updating: iceoryx" )
-        FetchContent_Populate(iceoryx)
+        message(STATUS "iceoryx_hoofs not found! Using FetchContent!")
     endif()
+    FetchContent_MakeAvailable(iceoryx)
 
     set(ICEORYX_WITH_FETCH_CONTENT true CACHE INTERNAL "")
     set(iceoryx_SOURCE_DIR ${iceoryx_SOURCE_DIR} CACHE INTERNAL "")

diff --git a/iceoryx2-ffi/cxx/tests/cmake/googletest.cmake b/iceoryx2-ffi/cxx/tests/cmake/googletest.cmake
@@ -13,14 +13,14 @@
 include(FetchContent)
 
 FetchContent_Declare(
-  googletest
-  GIT_REPOSITORY https://github.com/google/googletest.git
-  GIT_TAG        v1.14.0
-  EXCLUDE_FROM_ALL
+    googletest
+    GIT_REPOSITORY https://github.com/google/googletest.git
+    GIT_TAG        v1.14.0
+    EXCLUDE_FROM_ALL
 )
 
 FetchContent_GetProperties(googletest)
 if(NOT googletest_POPULATED)
-  FetchContent_Populate(googletest)
-  add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
+    message(STATUS "googletest not found! Using FetchContent!")
 endif()
+FetchContent_MakeAvailable(googletest)