[hamradio-commits] [gnss-sdr] 14/18: fixing detection and use of libgtest-dev

[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 fae3aa4f19ce5ae868198df9aabb37b82f840390
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sun Dec 7 20:42:52 2014 +0100

    fixing detection and use of libgtest-dev
---
 src/tests/CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index e2ee11b..9d20192 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -24,17 +24,17 @@ if(GTEST_DIR)
     set(GTEST_DIR_LOCAL ${GTEST_DIR})
 endif(GTEST_DIR)
 if(NOT GTEST_DIR_LOCAL)
-    set(GTEST_DIR_LOCAL false CACHE STRING "Gtest downloaded and built automatically")
+    set(GTEST_DIR_LOCAL false)
 else()
-	set(GTEST_DIR_LOCAL true CACHE STRING "Gtest already downloaded")
+	set(GTEST_DIR_LOCAL true)
 endif(NOT GTEST_DIR_LOCAL)
 find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h
           PATHS /usr/include)
 if(GTEST_INCLUDE_DIRS)
-    set(GTEST_DIR_LOCAL true CACHE STRING "Gtest already downloaded")
+    set(GTEST_DIR_LOCAL true)
 endif(GTEST_INCLUDE_DIRS)
 
-if(NOT GTEST_DIR_LOCAL)
+if(NOT ${GTEST_DIR_LOCAL})
      # if GTEST_DIR is not defined, we download and build it
      set(gtest_RELEASE 1.7.0)
      if(OS_IS_MACOSX)
@@ -84,7 +84,7 @@ if(NOT GTEST_DIR_LOCAL)
           ${binary_dir}/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main.a 
      ) 
 	 set(GTEST_LIB_DIR "${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${gtest_RELEASE}")
-else(NOT GTEST_DIR_LOCAL)
+else(NOT ${GTEST_DIR_LOCAL})
      if(GTEST_INCLUDE_DIRS)
           find_path(GTEST_SOURCE_DIR NAMES gtest-all.cc
                     PATHS /usr/src/gtest/src)
@@ -98,7 +98,7 @@ else(NOT GTEST_DIR_LOCAL)
           add_library(gtest ${GTEST_DIR}/src/gtest-all.cc ${GTEST_DIR}/src/gtest_main.cc)
           set(GTEST_LIBRARIES gtest)
      endif(GTEST_INCLUDE_DIRS)
-endif(NOT GTEST_DIR_LOCAL)
+endif(NOT ${GTEST_DIR_LOCAL})
 
 
 set(GNSS_SDR_TEST_OPTIONAL_LIBS "")

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