[hamradio-commits] [gnss-sdr] 17/18: finding sources of libgtest-dev package

Carles Fernandez carles_fernandez-guest at moszumanska.debian.org
Sun Dec 7 22:13:55 UTC 2014


This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit 393375f8f07089df43b5419503cfea0dc824f4f1
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sun Dec 7 22:09:24 2014 +0100

    finding sources of libgtest-dev package
---
 src/tests/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 9d20192..f7ca063 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -86,9 +86,9 @@ if(NOT ${GTEST_DIR_LOCAL})
 	 set(GTEST_LIB_DIR "${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${gtest_RELEASE}")
 else(NOT ${GTEST_DIR_LOCAL})
      if(GTEST_INCLUDE_DIRS)
-          find_path(GTEST_SOURCE_DIR NAMES gtest-all.cc
-                    PATHS /usr/src/gtest/src)
-          set(GTEST_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS} {GTEST_SOURCE_DIR})
+          find_path(GTEST_SOURCE_DIR NAMES gtest-all.cc PATHS /usr/src/gtest/src)
+          find_path(GTEST_SOURCE_INCLUDE NAMES src/gtest-all.cc PATHS /usr/src/gtest)
+          set(GTEST_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS} ${GTEST_SOURCE_INCLUDE} ${GTEST_SOURCE_DIR})
           add_library(gtest ${GTEST_SOURCE_DIR}/gtest-all.cc ${GTEST_SOURCE_DIR}/gtest_main.cc)
           set(GTEST_LIBRARIES gtest)
      else(GTEST_INCLUDE_DIRS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git



More information about the pkg-hamradio-commits mailing list