]> git.saurik.com Git - apt.git/commitdiff
follow the googletest merge in build-depends
authorDavid Kalnischkies <david@kalnischkies.de>
Fri, 18 Nov 2016 11:12:51 +0000 (12:12 +0100)
committerDavid Kalnischkies <david@kalnischkies.de>
Thu, 24 Nov 2016 23:15:13 +0000 (00:15 +0100)
debian/control
test/libapt/CMakeLists.txt

index 72a8837e778f3c62f0504896bde15937e50d3b92..96bbef348bd2caa896d16dfa3ec716127825efd6 100644 (file)
@@ -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,
index f3df14848db0b46358020f75db6b2a067373b00f..f7cd5b2f6e5a73619c6396c6c2ebc771a341c4cc 100644 (file)
@@ -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)