[visp] 05/05: Avoid linking against useless dependency in FindGSL.cmake if possible.

Thomas Moulard thomas_moulard-guest at moszumanska.debian.org
Thu Jul 10 18:50:17 UTC 2014


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

thomas_moulard-guest pushed a commit to branch patch-queue/master
in repository visp.

commit 6ee5f02b79f095f12610069f29462f161c9eb853
Author: Thomas Moulard <thomas.moulard at gmail.com>
Date:   Fri Jul 11 03:47:21 2014 +0900

    Avoid linking against useless dependency in FindGSL.cmake if possible.
    
    * CMakeModules/FindGSL.cmake: do not link against libgslcblas.so if
      not needed.
---
 CMakeModules/FindGSL.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeModules/FindGSL.cmake b/CMakeModules/FindGSL.cmake
index adecf19..62f89fe 100644
--- a/CMakeModules/FindGSL.cmake
+++ b/CMakeModules/FindGSL.cmake
@@ -173,6 +173,7 @@ ELSE(WIN32)
       FOREACH(libs ${GSL_LINK_LIBRARIES})
 	STRING(REGEX REPLACE "[-][l]" "" GSL_LIB_ONES ${libs})
     	#MESSAGE("GSL_LIB_ONES=${GSL_LIB_ONES} -  ${libs}")
+	if(NOT ${GSL_LIB_ONES} MATCHES "gslcblas")
   	MARK_AS_ADVANCED(LIBGSL_${GSL_LIB_ONES})
 	FIND_LIBRARY(LIBGSL_${GSL_LIB_ONES}
 	  NAMES ${GSL_LIB_ONES}
@@ -186,6 +187,7 @@ ELSE(WIN32)
      	  #MESSAGE("LIB_GSL=${LIB_GSL} -  ${libs}")
 	  LIST(APPEND GSL_LIBRARIES ${LIBGSL_${GSL_LIB_ONES}})
         ENDIF()
+	endif()
       ENDFOREACH(libs)
 
       #MESSAGE("GSL_LIBRARIES=${GSL_LIBRARIES}")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/visp.git



More information about the debian-science-commits mailing list