[QGIS Commit] r12866 - in trunk/qgis: . cmake

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-02-03 07:59:32 -0500 (Wed, 03 Feb 2010)
New Revision: 12866

Modified:
   trunk/qgis/CMakeLists.txt
   trunk/qgis/cmake/FindGSL.cmake
Log:
revert CBLAS part of r11250:
we actually don't use CBLAS directly, but GSL does w/o being linked to it
(see also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456898)


Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt	2010-02-03 11:58:56 UTC (rev 12865)
+++ trunk/qgis/CMakeLists.txt	2010-02-03 12:59:32 UTC (rev 12866)
@@ -110,9 +110,6 @@
 #############################################################
 # search for dependencies
 
-# we use cblas for the Helmert transformation
-SET(DONT_LINK_CBLAS FALSE)
-
 IF(NOT WIN32)
   INCLUDE(CheckFunctionExists)
   CHECK_FUNCTION_EXISTS(openpty OPENPTY_IN_LIBC)

Modified: trunk/qgis/cmake/FindGSL.cmake
===================================================================
--- trunk/qgis/cmake/FindGSL.cmake	2010-02-03 11:58:56 UTC (rev 12865)
+++ trunk/qgis/cmake/FindGSL.cmake	2010-02-03 12:59:32 UTC (rev 12866)
@@ -38,20 +38,12 @@
     ${GSL_MSVC_PREFIX}/lib
     )
 
-  IF (DONT_LINK_CBLAS)
-    IF (GSL_LIB)
-      SET (GSL_LIBRARIES ${GSL_LIB} )
-    ENDIF (GSL_LIB)
-  ELSE (DONT_LINK_CBLAS)
-    FIND_LIBRARY(GSLCBLAS_LIB gslcblas cblas PATHS 
-      ${GSL_MINGW_PREFIX}/lib 
-      ${GSL_MSVC_PREFIX}/lib
-      )
-    IF (GSL_LIB AND GSLCBLAS_LIB)
-      SET (GSL_LIBRARIES ${GSL_LIB} ${GSLCBLAS_LIB})
-    ENDIF (GSL_LIB AND GSLCBLAS_LIB)
-  ENDIF (DONT_LINK_CBLAS)
-  
+  FIND_LIBRARY(GSLCBLAS_LIB gslcblas cblas PATHS 
+    ${GSL_MINGW_PREFIX}/lib 
+    ${GSL_MSVC_PREFIX}/lib
+  )
+
+  SET (GSL_LIBRARIES ${GSL_LIB} ${GSLCBLAS_LIB})
 ELSE(WIN32)
   IF(UNIX) 
     SET(GSL_CONFIG_PREFER_PATH "$ENV{GSL_HOME}/bin" CACHE STRING "preferred path to GSL (gsl-config)")
@@ -63,12 +55,6 @@
     # MESSAGE("DBG GSL_CONFIG ${GSL_CONFIG}")
 
     IF (GSL_CONFIG) 
-      IF (DONT_LINK_CBLAS)
-        SET(LIBS_ARG "--libs-without-cblas")
-      ELSE (DONT_LINK_CBLAS)
-        SET(LIBS_ARG "--libs")
-      ENDIF (DONT_LINK_CBLAS)
-    
       # set CXXFLAGS to be fed into CXX_FLAGS by the user:
       SET(GSL_CXX_FLAGS "`${GSL_CONFIG} --cflags`")
       
@@ -80,7 +66,7 @@
 
       # set link libraries and link flags
       EXEC_PROGRAM(${GSL_CONFIG}
-          ARGS ${LIBS_ARG}
+          ARGS --libs
           OUTPUT_VARIABLE GSL_LIBRARIES)
       
       ## extract link dirs for rpath