Skip to content
Permalink
Browse files
Fix ticket #2882 (not using QGIS_LIB_SUBDIR to determine pathname to the
qgis library directory for linux builds)


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13912 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
gjm committed Jul 12, 2010
1 parent 2004f26 commit 894639fd3ef5065cdfc5fb24c547820d4019fc21
Showing with 4 additions and 1 deletion.
  1. +1 −0 cmake_templates/qgsconfig.h.in
  2. +3 −1 src/app/qgisapp.cpp
@@ -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

@@ -4931,8 +4931,10 @@ void QgisApp::showPluginManager()
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" );

0 comments on commit 894639f

Please sign in to comment.