[hamradio-commits] [gnss-sdr] 154/303: Fix building when gflags is installed in the system but glog is not

[Carles Fernandez]

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

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

commit 38bf45079fe9a1ee113012de2da065a418c55dcf
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sat Nov 5 09:20:24 2016 +0100

    Fix building when gflags is installed in the system but glog is not
---
 CMakeLists.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c05d573..e6f093b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -553,16 +553,18 @@ if (NOT GLOG_FOUND OR ${LOCAL_GFLAGS})
      set(TARGET_GFLAGS gflags-${gflags_RELEASE})
      if(${LOCAL_GFLAGS})
          set(GFLAGS_LIBRARIES_TO_LINK ${GFlags_SHARED_LIBS})
+         set(GFLAGS_LIBRARY_DIR_TO_LINK ${CMAKE_CURRENT_BINARY_DIR}/gflags-${gflags_RELEASE}/lib)
      else(${LOCAL_GFLAGS})  
          set(GFLAGS_LIBRARIES_TO_LINK ${GFlags_LIBS})
+         set(GFLAGS_LIBRARY_DIR_TO_LINK ${GFlags_LIBRARY_DIRS})
      endif(${LOCAL_GFLAGS})
      
      if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
          file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/glog-${glog_RELEASE}/tmp/configure_with_gflags
 "#!/bin/sh
 export CPPFLAGS=-I${GFlags_INCLUDE_DIRS}
-export LDFLAGS=-L${CMAKE_CURRENT_BINARY_DIR}/gflags-${gflags_RELEASE}/lib
-export LIBS=${GFLAGS_LIBRARIES_TO_LINK}
+export LDFLAGS=-L${GFLAGS_LIBRARY_DIR_TO_LINK}
+export LIBS=\"${GFLAGS_LIBRARIES_TO_LINK} -lc++\"
 export CXXFLAGS=\"-stdlib=libc++\"
 export CC=clang
 export CXX=clang++
@@ -577,7 +579,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${glog_RELEASE}/configure")
              file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/glog-${glog_RELEASE}/tmp/configure_with_gflags
 "#!/bin/sh
 export CPPFLAGS=-I${GFlags_INCLUDE_DIRS}
-export LDFLAGS=-L${CMAKE_CURRENT_BINARY_DIR}/gflags-${gflags_RELEASE}/lib
+export LDFLAGS=-L${GFLAGS_LIBRARY_DIR_TO_LINK}
 export LIBS=${GFLAGS_LIBRARIES_TO_LINK}
 cd ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${glog_RELEASE}/
 aclocal

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