summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-11-18 12:12:51 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2016-11-25 00:15:13 +0100
commit0123ce7171b09ead5a07567fbd33c53f609f6560 (patch)
tree7d07afad8ff352ccf75665a115a071a49512ae61
parent5832913a49d4f7c75527264a935cc0ce00627f1d (diff)
follow the googletest merge in build-depends
-rw-r--r--debian/control2
-rw-r--r--test/libapt/CMakeLists.txt6
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/control b/debian/control
index 72a8837e7..96bbef348 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: cmake (>= 3.4),
libbz2-dev,
libcurl4-gnutls-dev (>= 7.19.4~),
libdb-dev,
- libgtest-dev <!nocheck>,
+ googletest <!nocheck> | libgtest-dev <!nocheck>,
liblz4-dev (>= 0.0~r126),
liblzma-dev,
pkg-config,
diff --git a/test/libapt/CMakeLists.txt b/test/libapt/CMakeLists.txt
index f3df14848..f7cd5b2f6 100644
--- a/test/libapt/CMakeLists.txt
+++ b/test/libapt/CMakeLists.txt
@@ -1,5 +1,7 @@
-set(GTEST_ROOT "/usr/src/gtest" CACHE FILEPATH "Path to GTest CMake project")
-
+find_path(GTEST_ROOT src/gtest.cc
+ /usr/src/googletest/googletest
+ /usr/src/gtest
+)
find_package(GTest)
set(GTEST_DEPENDENCIES)