diff --git a/test/gtest/CMakeLists.txt b/test/gtest/CMakeLists.txt
index 488f8fd66029c5b39bb6288e9d79afdedf8b0616..6bd660986b576b3d2e44d3ce3d525034b0f14aa0 100644
--- a/test/gtest/CMakeLists.txt
+++ b/test/gtest/CMakeLists.txt
@@ -63,7 +63,12 @@ else()
     GIT_REPOSITORY https://github.com/google/googletest.git 
     GIT_TAG main)
 
-  FetchContent_MakeAvailable(googletest)
+  #FetchContent_MakeAvailable(googletest)
+  FetchContent_GetProperties(googletest)
+  if(NOT googletest_POPULATED)
+    FetchContent_Populate(googletest)
+    add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
+  endif()
     
 endif()
   
@@ -71,7 +76,7 @@ function(gnss_utils_add_gtest target)
   add_executable(${target} ${ARGN})
   if(${CMAKE_VERSION} VERSION_LESS "3.11.0") 
     add_dependencies(${target} libgtest)
-    target_link_libraries(${target} libgtest ${PROJECT_NAME})
+    target_link_libraries(${target} PUBLIC libgtest ${PROJECT_NAME})
     target_include_directories(${target} PUBLIC ${GTEST_INCLUDE_DIRS})
   else()
     target_link_libraries(${target} PUBLIC gtest_main ${PROJECT_NAME})