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

Revert "make cmake honor PYTHON_LIBRARY and find the default both in x86 (tested on ubuntu 12.10 64) and android "

Browse Source 
This reverts commit f7f3e413b726024384235a3654d6b18d9ff073be.
This commit is contained in:
Tim Sutton 2013-05-19 15:31:51 +02:00
parent 46b347145a
commit d2433c561d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/FindPythonLibrary.cmake
View File

@ -26,10 +26,10 @@
INCLUDE(CMakeFindFrameworks)
if(EXISTS ${PYTHON_LIBRARY})
if(EXISTS PYTHON_LIBRARY)
# Already in cache, be silent
set(PYTHONLIBRARY_FOUND TRUE)
else(EXISTS ${PYTHON_LIBRARY})
else(EXISTS PYTHON_LIBRARY)
set(_custom_python_fw FALSE)
if(APPLE AND PYTHON_CUSTOM_FRAMEWORK)
@ -69,7 +69,6 @@ else(EXISTS ${PYTHON_LIBRARY})
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)
set(PYTHON_INCLUDE_PATH ${PYTHON_INCLUDE_PATH} CACHE FILEPATH "Directory holding the python.h include file")
set(PYTHONLIBRARY_FOUND TRUE)
endif(python_config)
@ -110,4 +109,4 @@ else(EXISTS ${PYTHON_LIBRARY})
endif(PYTHONLIBRARY_FIND_REQUIRED)
endif(PYTHONLIBRARY_FOUND)
endif (EXISTS ${PYTHON_LIBRARY})
endif (EXISTS PYTHON_LIBRARY)