diff --git a/cpp/cmake/thirdparty/get_faiss.cmake b/cpp/cmake/thirdparty/get_faiss.cmake
index ed64e70ff2..cf4197782c 100644
--- a/cpp/cmake/thirdparty/get_faiss.cmake
+++ b/cpp/cmake/thirdparty/get_faiss.cmake
@@ -98,7 +98,7 @@ function(find_and_configure_faiss)
                   NAMESPACE faiss::)
   endif()
 
-  # Need to tell CMake to rescan the link group of faiss::faiss_gpu_objs and faiss
+  # Need to tell CMake to rescan the link group of faiss and include faiss_gpu_objs
   # so that we get proper link order when they are static
   #
   # We don't look at the existence of `faiss_avx2` as it will always exist
@@ -107,9 +107,9 @@ function(find_and_configure_faiss)
   # a dependency to it. Adding a dependency will cause it to compile,
   # and fail due to invalid compiler flags.
   if(PKG_ENABLE_GPU AND PKG_BUILD_STATIC_LIBS AND CXX_AVX2_FOUND)
-    set(CUVS_FAISS_TARGETS "$<LINK_GROUP:RESCAN,$<LINK_LIBRARY:WHOLE_ARCHIVE,faiss_gpu_objs>,faiss::faiss_avx2>" PARENT_SCOPE)
+    set(CUVS_FAISS_TARGETS "$<TARGET_OBJECTS:faiss_gpu_objs>;$<LINK_GROUP:RESCAN,$<LINK_LIBRARY:WHOLE_ARCHIVE,faiss::faiss_avx2>>" PARENT_SCOPE)
   elseif(PKG_ENABLE_GPU AND  PKG_BUILD_STATIC_LIBS)
-    set(CUVS_FAISS_TARGETS "$<LINK_GROUP:RESCAN,$<LINK_LIBRARY:WHOLE_ARCHIVE,faiss_gpu_objs>,faiss::faiss>" PARENT_SCOPE)
+    set(CUVS_FAISS_TARGETS "$<TARGET_OBJECTS:faiss_gpu_objs>;$<LINK_GROUP:RESCAN,$<LINK_LIBRARY:WHOLE_ARCHIVE,faiss::faiss>>" PARENT_SCOPE)
   elseif(CXX_AVX2_FOUND)
     set(CUVS_FAISS_TARGETS faiss::faiss_avx2 PARENT_SCOPE)
   elseif(CXX_SVE_FOUND AND CUVS_CPU_ONLY_FAISS_ENABLE_SVE)