From 0123ce7171b09ead5a07567fbd33c53f609f6560 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 18 Nov 2016 12:12:51 +0100 Subject: follow the googletest merge in build-depends --- debian/control | 2 +- test/libapt/CMakeLists.txt | 6 ++++-- 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 , + googletest | libgtest-dev , 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) -- cgit v1.2.3