Package: qgis / 2.4.0-1

0001-Finding-python-library-on-Ubuntu-14.04-64bit.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
From b2df34fcd16b139422c94b7480ae1b9a9bda136d Mon Sep 17 00:00:00 2001
From: Jarl Friis <jarl@softace.dk>
Date: Wed, 6 Aug 2014 12:22:54 +0200
Subject: Finding python library on Ubuntu 14.04 64bit
Origin: https://github.com/qgis/QGIS/commit/b2df34fcd16b139422c94b7480ae1b9a9bda136d


--- a/cmake/FindPythonLibrary.cmake
+++ b/cmake/FindPythonLibrary.cmake
@@ -68,7 +68,7 @@ else(EXISTS "${PYTHON_INCLUDE_PATH}" AND
       if(WIN32)
           STRING(REPLACE "\\" "/" PYTHON_SITE_PACKAGES_DIR ${PYTHON_SITE_PACKAGES_DIR})
       endif(WIN32)
-      FIND_LIBRARY(PYTHON_LIBRARY NAMES ${PYTHON_LIBRARY_NAMES} PATHS ${PYTHON_PREFIX}/lib ${PYTHON_PREFIX}/libs NO_DEFAULT_PATH)
+      FIND_LIBRARY(PYTHON_LIBRARY NAMES ${PYTHON_LIBRARY_NAMES})
       set(PYTHON_INCLUDE_PATH ${PYTHON_INCLUDE_PATH} CACHE FILEPATH "Directory holding the python.h include file" FORCE)
       set(PYTHONLIBRARY_FOUND TRUE)
     endif(python_config)