[hamradio-commits] [gnss-sdr] 02/18: Fix detection of libgoogle-glog-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 5dec6e375b79c5f7a6348333a1faaeda62863920
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sun Dec 7 10:57:15 2014 +0100

    Fix detection of libgoogle-glog-dev
---
 cmake/Modules/FindGLOG.cmake | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/cmake/Modules/FindGLOG.cmake b/cmake/Modules/FindGLOG.cmake
index d2d4680..93c684c 100644
--- a/cmake/Modules/FindGLOG.cmake
+++ b/cmake/Modules/FindGLOG.cmake
@@ -25,6 +25,11 @@ macro(_FIND_GLOG_LIBRARIES _var)
      find_library(${_var}
           NAMES  ${ARGN}
           PATHS ${LIB_PATHS} /opt/local/lib
+		                     /usr/lib/x86_64-linux-gnu
+							 /usr/lib/i386-linux-gnu
+							 /usr/lib/arm-linux-gnueabihf
+							 /usr/lib/arm-linux-gnueabi
+							 /usr/lib/aarch64-linux-gnu
           PATH_SUFFIXES lib
       )
      mark_as_advanced(${_var})
@@ -40,14 +45,14 @@ endif()
 endmacro()
 
 if(MSVC)
-     find_path(GLOG_INCLUDE_DIR NAMES raw_logging.h
+     find_path(GLOG_INCLUDE_DIRS NAMES raw_logging.h
           PATHS
           ${GLOG_ROOT}/src/windows
           ${GLOG_ROOT}/src/windows/glog
      )
 else(MSVC)
      # Linux/OS X builds
-     find_path(GLOG_INCLUDE_DIR NAMES raw_logging.h
+     find_path(GLOG_INCLUDE_DIRS NAMES raw_logging.h
      PATHS
      ${GLOG_ROOT}/include/glog
      /opt/local/include/glog   # default location in Macports

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