sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

revert CBLAS part of r11250:

Browse Source 
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
This commit is contained in:
jef 2010-02-03 12:59:32 +00:00
parent 8b368d94c0
commit 95190d9928
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -110,9 +110,6 @@ ENDIF (NOT BISON_EXECUTABLE)
############################################################# #############################################################
# search for dependencies # search for dependencies
# we use cblas for the Helmert transformation
SET(DONT_LINK_CBLAS FALSE)
IF(NOT WIN32) IF(NOT WIN32)
INCLUDE(CheckFunctionExists) INCLUDE(CheckFunctionExists)
CHECK_FUNCTION_EXISTS(openpty OPENPTY_IN_LIBC) CHECK_FUNCTION_EXISTS(openpty OPENPTY_IN_LIBC)

28
cmake/FindGSL.cmake
View File

@ -38,20 +38,12 @@ IF(WIN32)
${GSL_MSVC_PREFIX}/lib ${GSL_MSVC_PREFIX}/lib
) )
IF (DONT_LINK_CBLAS) FIND_LIBRARY(GSLCBLAS_LIB gslcblas cblas PATHS
IF (GSL_LIB) ${GSL_MINGW_PREFIX}/lib
SET (GSL_LIBRARIES ${GSL_LIB} ) ${GSL_MSVC_PREFIX}/lib
ENDIF (GSL_LIB) )
ELSE (DONT_LINK_CBLAS)
FIND_LIBRARY(GSLCBLAS_LIB gslcblas cblas PATHS SET (GSL_LIBRARIES ${GSL_LIB} ${GSLCBLAS_LIB})
${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)
ELSE(WIN32) ELSE(WIN32)
IF(UNIX) IF(UNIX)
SET(GSL_CONFIG_PREFER_PATH "$ENV{GSL_HOME}/bin" CACHE STRING "preferred path to GSL (gsl-config)") 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}") # MESSAGE("DBG GSL_CONFIG ${GSL_CONFIG}")
IF (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 CXXFLAGS to be fed into CXX_FLAGS by the user:
SET(GSL_CXX_FLAGS "`${GSL_CONFIG} --cflags`") SET(GSL_CXX_FLAGS "`${GSL_CONFIG} --cflags`")
@ -80,7 +66,7 @@ ELSE(WIN32)
# set link libraries and link flags # set link libraries and link flags
EXEC_PROGRAM(${GSL_CONFIG} EXEC_PROGRAM(${GSL_CONFIG}
ARGS ${LIBS_ARG} ARGS --libs
OUTPUT_VARIABLE GSL_LIBRARIES) OUTPUT_VARIABLE GSL_LIBRARIES)
## extract link dirs for rpath ## extract link dirs for rpath