Merge pull request #13742 from vespa-engine/toregge/use-find-package-to-find-gtest

Use find_package to find gtest library.

11 files changed, 22 insertions, 11 deletions

diff --git a/vespalib/src/tests/crypto/CMakeLists.txt b/vespalib/src/tests/crypto/CMakeLists.txt
index b930b5715b5..d0661461dd4 100644
--- a/vespalib/src/tests/crypto/CMakeLists.txt
+++ b/vespalib/src/tests/crypto/CMakeLists.txt
@@ -1,10 +1,11 @@
 # Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_crypto_crypto_test_app TEST
     SOURCES
     crypto_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_crypto_crypto_test_app COMMAND vespalib_crypto_crypto_test_app)
 
diff --git a/vespalib/src/tests/datastore/datastore/CMakeLists.txt b/vespalib/src/tests/datastore/datastore/CMakeLists.txt
index eb3e0a4576a..631c1812a7f 100644
--- a/vespalib/src/tests/datastore/datastore/CMakeLists.txt
+++ b/vespalib/src/tests/datastore/datastore/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_datastore_test_app TEST
     SOURCES
     datastore_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_datastore_test_app COMMAND vespalib_datastore_test_app)
diff --git a/vespalib/src/tests/datastore/unique_store/CMakeLists.txt b/vespalib/src/tests/datastore/unique_store/CMakeLists.txt
index d72e8c10ad5..29b34e93247 100644
--- a/vespalib/src/tests/datastore/unique_store/CMakeLists.txt
+++ b/vespalib/src/tests/datastore/unique_store/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_unique_store_test_app TEST
     SOURCES
     unique_store_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_unique_store_test_app COMMAND vespalib_unique_store_test_app)
diff --git a/vespalib/src/tests/datastore/unique_store_dictionary/CMakeLists.txt b/vespalib/src/tests/datastore/unique_store_dictionary/CMakeLists.txt
index b1478dea22c..2208902b5bb 100644
--- a/vespalib/src/tests/datastore/unique_store_dictionary/CMakeLists.txt
+++ b/vespalib/src/tests/datastore/unique_store_dictionary/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_unique_store_dictionary_test_app TEST
     SOURCES
     unique_store_dictionary_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_unique_store_dictionary_test_app COMMAND vespalib_unique_store_dictionary_test_app)
diff --git a/vespalib/src/tests/datastore/unique_store_string_allocator/CMakeLists.txt b/vespalib/src/tests/datastore/unique_store_string_allocator/CMakeLists.txt
index c2a9999d545..9984877ab21 100644
--- a/vespalib/src/tests/datastore/unique_store_string_allocator/CMakeLists.txt
+++ b/vespalib/src/tests/datastore/unique_store_string_allocator/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_unique_store_string_allocator_test_app TEST
     SOURCES
     unique_store_string_allocator_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_unique_store_string_allocator_test_app COMMAND vespalib_unique_store_string_allocator_test_app)
diff --git a/vespalib/src/tests/overload/CMakeLists.txt b/vespalib/src/tests/overload/CMakeLists.txt
index 67aa6230225..a03f6fbdc8d 100644
--- a/vespalib/src/tests/overload/CMakeLists.txt
+++ b/vespalib/src/tests/overload/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_overload_test_app TEST
     SOURCES
     overload_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_overload_test_app COMMAND vespalib_overload_test_app)
diff --git a/vespalib/src/tests/stllike/CMakeLists.txt b/vespalib/src/tests/stllike/CMakeLists.txt
index ebf7de9c747..41e0b9e8507 100644
--- a/vespalib/src/tests/stllike/CMakeLists.txt
+++ b/vespalib/src/tests/stllike/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_hash_test_app TEST
     SOURCES
     hash_test.cpp
@@ -52,6 +53,6 @@ vespa_add_executable(vespalib_replace_variable_test_app TEST
     replace_variable_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_replace_variable_test_app COMMAND vespalib_replace_variable_test_app)
diff --git a/vespalib/src/tests/time/CMakeLists.txt b/vespalib/src/tests/time/CMakeLists.txt
index e43bd9097e5..ba639f2392e 100644
--- a/vespalib/src/tests/time/CMakeLists.txt
+++ b/vespalib/src/tests/time/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_time_box_test_app TEST
     SOURCES
     time_box_test.cpp
@@ -11,6 +12,6 @@ vespa_add_executable(vespalib_time_test_app TEST
     time_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_time_test_app COMMAND vespalib_time_test_app)
diff --git a/vespalib/src/tests/typify/CMakeLists.txt b/vespalib/src/tests/typify/CMakeLists.txt
index 29e95af1988..c8e53d6baca 100644
--- a/vespalib/src/tests/typify/CMakeLists.txt
+++ b/vespalib/src/tests/typify/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_typify_test_app TEST
     SOURCES
     typify_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_typify_test_app COMMAND vespalib_typify_test_app)
diff --git a/vespalib/src/tests/util/reusable_set/CMakeLists.txt b/vespalib/src/tests/util/reusable_set/CMakeLists.txt
index 9c46b5ba61e..edbbc2ff11f 100644
--- a/vespalib/src/tests/util/reusable_set/CMakeLists.txt
+++ b/vespalib/src/tests/util/reusable_set/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_reusable_set_test_app TEST
     SOURCES
     reusable_set_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_reusable_set_test_app COMMAND vespalib_reusable_set_test_app)
diff --git a/vespalib/src/tests/visit_ranges/CMakeLists.txt b/vespalib/src/tests/visit_ranges/CMakeLists.txt
index de94b2ebb1e..3c51d7c1e34 100644
--- a/vespalib/src/tests/visit_ranges/CMakeLists.txt
+++ b/vespalib/src/tests/visit_ranges/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(GTest REQUIRED)
 vespa_add_executable(vespalib_visit_ranges_test_app TEST
     SOURCES
     visit_ranges_test.cpp
     DEPENDS
     vespalib
-    gtest
+    GTest::GTest
 )
 vespa_add_test(NAME vespalib_visit_ranges_test_app COMMAND vespalib_visit_ranges_test_app)