[hamradio-commits] [gnss-sdr] 41/44: Fixing Gtest detection

[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 3e5332ff57d3154988751ea98209bab5c13a3d0e
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sun Feb 15 14:49:17 2015 +0100

    Fixing Gtest detection
---
 CMakeLists.txt           |  6 ++++--
 src/tests/CMakeLists.txt | 14 ++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7104837..73af2ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -276,14 +276,16 @@ if(EXISTS $ENV{GTEST_DIR})
 endif(EXISTS $ENV{GTEST_DIR})
 if(GTEST_DIR)
      message(STATUS "Googletest root folder set at ${GTEST_DIR}")
-     find_path(LIBGTEST_DEV_DIR NAMES gtest-all.cc PATHS ${GTEST_DIR}/src)
+     find_path(LIBGTEST_DEV_DIR NAMES src/gtest-all.cc PATHS ${GTEST_DIR})
           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)
+     find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h PATHS ${GTEST_DIR}/include)
 else(GTEST_DIR)
-     find_path(LIBGTEST_DEV_DIR NAMES gtest-all.cc PATHS /usr/src/gtest/src /opt/local/src/gtest/src)
+     find_path(LIBGTEST_DEV_DIR NAMES src/gtest-all.cc PATHS /usr/src/gtest /opt/local/src/gtest)
+     find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h PATHS /usr/include /opt/local/include)
      if(LIBGTEST_DEV_DIR)
          message (STATUS "Googletest (libgtest-dev package) has been found.")
      else(LIBGTEST_DEV_DIR)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 21ff8e9..0eb1127 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -28,8 +28,7 @@ if(NOT GTEST_DIR_LOCAL)
 else()
 	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)
 endif(GTEST_INCLUDE_DIRS)
@@ -86,10 +85,12 @@ 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)
-          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)
+          #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_SOURCE_INCLUDE ${GTEST_INCLUDE_DIRS})
+          set(GTEST_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS} ${LIBGTEST_DEV_DIR})
+          message("++++ ${LIBGTEST_DEV_DIR}")
+          add_library(gtest ${LIBGTEST_DEV_DIR}/src/gtest-all.cc ${LIBGTEST_DEV_DIR}/src/gtest_main.cc)
           set(GTEST_LIBRARIES gtest)
      else(GTEST_INCLUDE_DIRS)
           # If the variable GTEST_DIR is defined, we use the existing Googletest
@@ -153,6 +154,7 @@ include_directories(
      ${VOLK_INCLUDE_DIRS}
      ${VOLK_GNSSSDR_INCLUDE_DIRS}
      ${GNSS_SDR_TEST_OPTIONAL_HEADERS}
+     ${GNSS_SDR_TEST_OPTIONAL_HEADERS}
 )
 
 

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