[hamradio-commits] [gnss-sdr] 40/44: Fixed Googletest detection when GTEST_DIR is set

[Carles Fernandez]

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 98d2fd31a0fb7f20e8bb82c301f33a10850e7a93
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sun Feb 15 13:11:58 2015 +0100

    Fixed Googletest detection when GTEST_DIR is set
---
 CMakeLists.txt | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3ccaa4..7104837 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -275,11 +275,17 @@ if(EXISTS $ENV{GTEST_DIR})
      set(GTEST_DIR $ENV{GTEST_DIR})
 endif(EXISTS $ENV{GTEST_DIR})
 if(GTEST_DIR)
-     message(STATUS "GTEST root folder at ${GTEST_DIR}")
+     message(STATUS "Googletest root folder set at ${GTEST_DIR}")
+     find_path(LIBGTEST_DEV_DIR NAMES gtest-all.cc PATHS ${GTEST_DIR}/src)
+          if(LIBGTEST_DEV_DIR)
+         message (STATUS "Googletest has been found.")
+     else(LIBGTEST_DEV_DIR)
+         message (FATAL_ERROR " Googletest source code has not been found at ${GTEST_DIR}.")
+     endif(LIBGTEST_DEV_DIR)
 else(GTEST_DIR)
-     find_path(LIBGTEST_DEV_DIR NAMES gtest-all.cc PATHS /usr/src/gtest/src)
+     find_path(LIBGTEST_DEV_DIR NAMES gtest-all.cc PATHS /usr/src/gtest/src /opt/local/src/gtest/src)
      if(LIBGTEST_DEV_DIR)
-         message (STATUS " Googletest (libgtest-dev package) has been found.")
+         message (STATUS "Googletest (libgtest-dev package) has been found.")
      else(LIBGTEST_DEV_DIR)
          message (STATUS " Googletest has not been found.")
          message (STATUS " Googletest will be downloaded and built automatically ")

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