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) git-svn-id: http://svn.osgeo.org/qgis/trunk@12866 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 3, 2010 · 95190d9 · 95190d9
1 parent 8b368d9
commit 95190d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -110,9 +110,6 @@ ENDIF (NOT BISON_EXECUTABLE)
 #############################################################
 # 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)

diff --git a/cmake/FindGSL.cmake b/cmake/FindGSL.cmake
@@ -38,20 +38,12 @@ IF(WIN32)
     ${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 @@ ELSE(WIN32)
     # 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 @@ ELSE(WIN32)
 
       # set link libraries and link flags
       EXEC_PROGRAM(${GSL_CONFIG}
-          ARGS ${LIBS_ARG}
+          ARGS --libs
           OUTPUT_VARIABLE GSL_LIBRARIES)
 
       ## extract link dirs for rpath