merge from trunk r11200:11250

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11884 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 2, 2009 · 20b599b · 20b599b
1 parent bbaf61d
commit 20b599b
Show file tree

Hide file tree

Showing 184 changed files with 80,962 additions and 30,318 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "2")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
-SET(RELEASE_NAME "Unstable Trunk")
+SET(RELEASE_NAME "Daphnis")
 SET(PROJECT_VERSION ${COMPLETE_VERSION})
 PROJECT(qgis${PROJECT_VERSION})
 # Note the version no is Mmmpp for Major/minor/patch, 0-padded, thus '10100' for 1.1.0
@@ -107,6 +107,9 @@ ENDIF (NOT BISON_EXECUTABLE)
 #############################################################
 # search for dependencies
 
+# we don't use cblas
+SET(DONT_LINK_CBLAS TRUE)
+
 # required
 FIND_PACKAGE(Proj)
 FIND_PACKAGE(Expat)    # GPS importer plugin

diff --git a/cmake/FindGSL.cmake b/cmake/FindGSL.cmake
@@ -27,24 +27,30 @@ IF(WIN32)
 
   SET(GSL_MINGW_PREFIX "c:/msys/local" )
   SET(GSL_MSVC_PREFIX "$ENV{LIB_DIR}")
-  FIND_LIBRARY(GSL_LIB gsl PATHS 
-    ${GSL_MINGW_PREFIX}/lib 
-    ${GSL_MSVC_PREFIX}/lib
-    )
-  #MSVC version of the lib is just called 'cblas'
-  FIND_LIBRARY(GSLCBLAS_LIB gslcblas cblas PATHS 
-    ${GSL_MINGW_PREFIX}/lib 
-    ${GSL_MSVC_PREFIX}/lib
-    )
 
   FIND_PATH(GSL_INCLUDE_DIR gsl/gsl_blas.h 
     ${GSL_MINGW_PREFIX}/include 
     ${GSL_MSVC_PREFIX}/include
     )
 
-  IF (GSL_LIB AND GSLCBLAS_LIB)
-    SET (GSL_LIBRARIES ${GSL_LIB} ${GSLCBLAS_LIB})
-  ENDIF (GSL_LIB AND GSLCBLAS_LIB)
+  FIND_LIBRARY(GSL_LIB gsl PATHS 
+    ${GSL_MINGW_PREFIX}/lib 
+    ${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)
 
 ELSE(WIN32)
   IF(UNIX) 
@@ -55,8 +61,14 @@ ELSE(WIN32)
       /usr/bin/
       )
     # 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`")
 
@@ -68,12 +80,12 @@ ELSE(WIN32)
 
       # set link libraries and link flags
       EXEC_PROGRAM(${GSL_CONFIG}
-          ARGS --libs
+          ARGS ${LIBS_ARG}
           OUTPUT_VARIABLE GSL_LIBRARIES)
 
       ## extract link dirs for rpath  
       EXEC_PROGRAM(${GSL_CONFIG}
-        ARGS --libs
+        ARGS ${LIBS_ARG}
         OUTPUT_VARIABLE GSL_CONFIG_LIBS )
 
       ## split off the link dirs (for rpath)

diff --git a/debian/qgis.install b/debian/qgis.install
@@ -23,6 +23,7 @@ usr/lib/qgis/libspatialiteprovider.so
 usr/lib/qgis/liboracleplugin.so
 usr/lib/qgis/libdiagramoverlay.so 
 usr/lib/qgis/libevis.so 
+usr/lib/qgis/libosmprovider.so 
 usr/share/pixmaps/qgis-icon.xpm
 usr/share/pixmaps/qgis-mime-icon.png
 usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes