[QGIS Commit] r13912 - in trunk/qgis: cmake_templates src/app

[svn_qgis at osgeo.org]

Author: gjm
Date: 2010-07-12 15:45:42 +0000 (Mon, 12 Jul 2010)
New Revision: 13912

Modified:
   trunk/qgis/cmake_templates/qgsconfig.h.in
   trunk/qgis/src/app/qgisapp.cpp
Log:
Fix ticket #2882 (not using QGIS_LIB_SUBDIR to determine pathname to the
qgis library directory for linux builds)


Modified: trunk/qgis/cmake_templates/qgsconfig.h.in
===================================================================
--- trunk/qgis/cmake_templates/qgsconfig.h.in	2010-07-12 13:34:30 UTC (rev 13911)
+++ trunk/qgis/cmake_templates/qgsconfig.h.in	2010-07-12 15:45:42 UTC (rev 13912)
@@ -23,6 +23,7 @@
 #define QGIS_PLUGIN_SUBDIR "${QGIS_PLUGIN_SUBDIR}"
 #define QGIS_DATA_SUBDIR "${QGIS_DATA_SUBDIR}"
 #define QGIS_LIBEXEC_SUBDIR "${QGIS_LIBEXEC_SUBDIR}"
+#define QGIS_LIB_SUBDIR "${QGIS_LIB_SUBDIR}"
 
 #cmakedefine HAVE_POSTGRESQL
 

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2010-07-12 13:34:30 UTC (rev 13911)
+++ trunk/qgis/src/app/qgisapp.cpp	2010-07-12 15:45:42 UTC (rev 13912)
@@ -4931,8 +4931,10 @@
 void QgisApp::loadPythonSupport()
 {
   QString pythonlibName( "qgispython" );
-#if defined(Q_WS_MAC) || defined(Q_OS_LINUX)
+#if defined(Q_WS_MAC)
   pythonlibName.prepend( QgsApplication::prefixPath() + "/lib/" );
+#elif defined(Q_OS_LINUX)
+  pythonlibName.prepend( QgsApplication::prefixPath() + "/" + QGIS_LIB_SUBDIR + "/" );
 #endif
 #ifdef __MINGW32__
   pythonlibName.prepend( "lib" );