From 5b20029658c23b6ce2d60eab19841ef8424858c6 Mon Sep 17 00:00:00 2001
From: Vinicius Monego <monego@posteo.net>
Date: Thu, 13 May 2021 14:12:58 -0300
Subject: [PATCH] Use system googletest.

---
 tests/gtests/CMakeLists.txt            | 5 ++---
 tests/gtests/api/CMakeLists.txt        | 4 ++--
 tests/gtests/internals/CMakeLists.txt  | 2 +-
 tests/gtests/ocl/CMakeLists.txt        | 2 +-
 tests/gtests/ocl/api/CMakeLists.txt    | 2 +-
 tests/gtests/regression/CMakeLists.txt | 2 +-
 tests/gtests/sycl/api/CMakeLists.txt   | 2 +-
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/tests/gtests/CMakeLists.txt b/tests/gtests/CMakeLists.txt
index cef298d..1e763af 100644
--- a/tests/gtests/CMakeLists.txt
+++ b/tests/gtests/CMakeLists.txt
@@ -19,7 +19,7 @@ if(WIN32 AND DNNL_WITH_SYCL)
     add_definitions(-DGTEST_HAS_SEH=0)
 endif()
 
-add_subdirectory (gtest)
+find_package(GTest CONFIG REQUIRED)
 
 set(APP_NAME "gtest")
 set(MAIN_SRC_GTEST ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
@@ -35,7 +35,6 @@ if(UNIX)
 endif()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_SOURCE_DIR}/gtest
                     ${CMAKE_CURRENT_SOURCE_DIR}/in
                     ${CMAKE_CURRENT_SOURCE_DIR}/../../src/common
                     ${CMAKE_CURRENT_SOURCE_DIR}/../../src/cpu
@@ -158,7 +157,7 @@ set_source_files_properties(
 function(register_gtest exe src)
     add_executable(${exe} ${MAIN_SRC_GTEST} ${src})
     add_definitions(-DNOMINMAX) # to allow std::max on Windows with parentheses
-    target_link_libraries(${exe} ${LIB_NAME} dnnl_gtest ${EXTRA_SHARED_LIBS})
+    target_link_libraries(${exe} ${LIB_NAME} gtest ${EXTRA_SHARED_LIBS})
 
     get_source_file_property(no_engine_param ${src} NO_ENGINE_PARAM)
 
diff --git a/tests/gtests/api/CMakeLists.txt b/tests/gtests/api/CMakeLists.txt
index 10819d1..6584541 100644
--- a/tests/gtests/api/CMakeLists.txt
+++ b/tests/gtests/api/CMakeLists.txt
@@ -27,11 +27,11 @@ endif()
 
 # Switch off C API tests for CUDA since USM model is not supported
 if(NOT DNNL_SYCL_CUDA)
-    register_exe(${TEST_EXE} "${TEST_SOURCES}" "test" "dnnl_gtest")
+    register_exe(${TEST_EXE} "${TEST_SOURCES}" "test" "gtest")
 endif()
 
 # Create DPC++ buffer target.
 if(DNNL_WITH_SYCL)
-    register_exe(${TEST_EXE}_buffer "${TEST_SOURCES}" "test" "dnnl_gtest")
+    register_exe(${TEST_EXE}_buffer "${TEST_SOURCES}" "test" "gtest")
     target_compile_definitions(${TEST_EXE}_buffer PUBLIC -DTEST_DNNL_DPCPP_BUFFER)
 endif()
diff --git a/tests/gtests/internals/CMakeLists.txt b/tests/gtests/internals/CMakeLists.txt
index c39d860..ae82272 100644
--- a/tests/gtests/internals/CMakeLists.txt
+++ b/tests/gtests/internals/CMakeLists.txt
@@ -24,4 +24,4 @@ endif()
 file(GLOB TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/test_*.cpp)
 list(APPEND TEST_SOURCES ${MAIN_SRC_GTEST})
 
-register_exe(${TEST_EXE} "${TEST_SOURCES}" "test" "dnnl_gtest")
+register_exe(${TEST_EXE} "${TEST_SOURCES}" "test" "gtest")
diff --git a/tests/gtests/ocl/CMakeLists.txt b/tests/gtests/ocl/CMakeLists.txt
index 9b686fb..c075271 100644
--- a/tests/gtests/ocl/CMakeLists.txt
+++ b/tests/gtests/ocl/CMakeLists.txt
@@ -20,5 +20,5 @@ file(GLOB TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/test_*.cpp)
 
 foreach(TEST_FILE ${TEST_SOURCES})
     get_filename_component(exe ${TEST_FILE} NAME_WE)
-    register_exe(${exe} "${TEST_SOURCES};${MAIN_SRC_GTEST}" "test" "dnnl_gtest")
+    register_exe(${exe} "${TEST_SOURCES};${MAIN_SRC_GTEST}" "test" "gtest")
 endforeach()
diff --git a/tests/gtests/ocl/api/CMakeLists.txt b/tests/gtests/ocl/api/CMakeLists.txt
index 6ca368e..dcd6e34 100644
--- a/tests/gtests/ocl/api/CMakeLists.txt
+++ b/tests/gtests/ocl/api/CMakeLists.txt
@@ -19,4 +19,4 @@ set(TEST_EXE test_api_ocl)
 file(GLOB TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/test_*.cpp)
 list(APPEND TEST_SOURCES ${MAIN_SRC_GTEST})
 
-register_exe(${TEST_EXE} "${TEST_SOURCES}" "test" "dnnl_gtest")
+register_exe(${TEST_EXE} "${TEST_SOURCES}" "test" "gtest")
diff --git a/tests/gtests/regression/CMakeLists.txt b/tests/gtests/regression/CMakeLists.txt
index 5d9692c..b9bbb77 100644
--- a/tests/gtests/regression/CMakeLists.txt
+++ b/tests/gtests/regression/CMakeLists.txt
@@ -19,4 +19,4 @@ set(TEST_EXE test_regression)
 file(GLOB TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/test_*.cpp)
 list(APPEND TEST_SOURCES ${MAIN_SRC_GTEST})
 
-register_exe(${TEST_EXE} "${TEST_SOURCES}" "test" "dnnl_gtest")
+register_exe(${TEST_EXE} "${TEST_SOURCES}" "test" "gtest")
diff --git a/tests/gtests/sycl/api/CMakeLists.txt b/tests/gtests/sycl/api/CMakeLists.txt
index 541a206..bedfeb6 100644
--- a/tests/gtests/sycl/api/CMakeLists.txt
+++ b/tests/gtests/sycl/api/CMakeLists.txt
@@ -19,4 +19,4 @@ set(TEST_EXE test_api_sycl)
 file(GLOB TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/test_*.cpp)
 list(APPEND TEST_SOURCES ${MAIN_SRC_GTEST})
 
-register_exe(${TEST_EXE} "${TEST_SOURCES}" "test" "dnnl_gtest")
+register_exe(${TEST_EXE} "${TEST_SOURCES}" "test" "gtest")
-- 
2.31.1