Merge pull request #2329 from DARMA-tasking/2321-build-system-is-mixi…

…ng-the-system-googletest-headers-with-our-internal-googletest #2321: Build system is mixing the system googletest headers with our internal googletest
DARMA-tasking · Jul 18, 2024 · 3f3c982 · 3f3c982
2 parents 056075b + eeae60d
commit 3f3c982
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/cmake/link_vt.cmake b/cmake/link_vt.cmake
@@ -90,7 +90,7 @@ function(link_target_with_vt)
     if (${ARG_DEBUG_LINK})
       message(STATUS "link_target_with_vt: gtest=${ARG_LINK_GTEST}")
     endif()
-    target_link_libraries(${ARG_TARGET} PRIVATE gtest)
+    target_link_libraries(${ARG_TARGET} PRIVATE ${GOOGLETEST_LIBRARY})
   endif()
 
   if (NOT DEFINED ARG_LINK_UNWIND AND ${ARG_DEFAULT_LINK_SET} OR ARG_LINK_UNWIND)

diff --git a/cmake/load_packages.cmake b/cmake/load_packages.cmake
@@ -7,7 +7,7 @@ include(cmake/load_local_packages.cmake)
 include(cmake/load_mpi_package.cmake)
 
 # ZLIB package
-include(cmake/load_zlib_package.cmake)
+find_package(ZLIB REQUIRED)
 
 # Perl is used to build the PMPI wrappers
 find_package(Perl)

diff --git a/cmake/load_zlib_package.cmake b/cmake/load_zlib_package.cmake