Use find_package to find gtest library.

6 files changed, 13 insertions, 6 deletions

diff --git a/vdslib/src/tests/CMakeLists.txt b/vdslib/src/tests/CMakeLists.txt
index f552808f97c..458f3bda01d 100644
--- a/vdslib/src/tests/CMakeLists.txt
+++ b/vdslib/src/tests/CMakeLists.txt
@@ -1,5 +1,7 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+find_package(GTest REQUIRED)
+
 # Runner for unit tests written in gtest.
 # NOTE: All new test classes should be added here.
 vespa_add_executable(vdslib_gtest_runner_app TEST
@@ -11,7 +13,7 @@ vespa_add_executable(vdslib_gtest_runner_app TEST
     vdslib_testdistribution
     vdslib_teststate
     vdslib_testthread
-    gtest
+    GTest::GTest
 )
 
 vespa_add_test(
diff --git a/vdslib/src/tests/bucketdistribution/CMakeLists.txt b/vdslib/src/tests/bucketdistribution/CMakeLists.txt
index ecb29e9b12d..986a7ff26ff 100644
--- a/vdslib/src/tests/bucketdistribution/CMakeLists.txt
+++ b/vdslib/src/tests/bucketdistribution/CMakeLists.txt
@@ -1,8 +1,9 @@
 # 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_library(vdslib_bucketdistributiontest
     SOURCES
     bucketdistributiontest.cpp
     DEPENDS
     vdslib
-    gtest
+    GTest::GTest
 )
diff --git a/vdslib/src/tests/container/CMakeLists.txt b/vdslib/src/tests/container/CMakeLists.txt
index 9f7b2e33efa..47ffbcf7b82 100644
--- a/vdslib/src/tests/container/CMakeLists.txt
+++ b/vdslib/src/tests/container/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_library(vdslib_containertest
     SOURCES
     parameterstest.cpp
@@ -6,5 +7,5 @@ vespa_add_library(vdslib_containertest
     documentsummarytest.cpp
     DEPENDS
     vdslib
-    gtest
+    GTest::GTest
 )
diff --git a/vdslib/src/tests/distribution/CMakeLists.txt b/vdslib/src/tests/distribution/CMakeLists.txt
index cdcfcfce5f9..61563c4c448 100644
--- a/vdslib/src/tests/distribution/CMakeLists.txt
+++ b/vdslib/src/tests/distribution/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_library(vdslib_testdistribution
     SOURCES
     distributiontest.cpp
@@ -6,5 +7,5 @@ vespa_add_library(vdslib_testdistribution
     idealnodecalculatorimpltest.cpp
     DEPENDS
     vdslib
-    gtest
+    GTest::GTest
 )
diff --git a/vdslib/src/tests/state/CMakeLists.txt b/vdslib/src/tests/state/CMakeLists.txt
index 0e057d12226..d28ff47798a 100644
--- a/vdslib/src/tests/state/CMakeLists.txt
+++ b/vdslib/src/tests/state/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_library(vdslib_teststate
     SOURCES
     cluster_state_bundle_test.cpp
@@ -7,5 +8,5 @@ vespa_add_library(vdslib_teststate
     nodestatetest.cpp
     DEPENDS
     vdslib
-    gtest
+    GTest::GTest
 )
diff --git a/vdslib/src/tests/thread/CMakeLists.txt b/vdslib/src/tests/thread/CMakeLists.txt
index 4d1e753a8f6..df2e8bf43f9 100644
--- a/vdslib/src/tests/thread/CMakeLists.txt
+++ b/vdslib/src/tests/thread/CMakeLists.txt
@@ -1,8 +1,9 @@
 # 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_library(vdslib_testthread
     SOURCES
     taskschedulertest.cpp
     DEPENDS
     vdslib
-    gtest
+    GTest::GTest
 )