Skip to content
Permalink
Browse files

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/qgis@12866 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Feb 3, 2010
1 parent f72111b commit ecae2407db33565328470628276e4a59fda12f62
Showing with 7 additions and 24 deletions.
  1. +0 −3 CMakeLists.txt
  2. +7 −21 cmake/FindGSL.cmake
@@ -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)
@@ -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

0 comments on commit ecae240

Please sign in to comment.
You can’t perform that action at this time.