Skip to content
Permalink
Browse files

make cmake honor PYTHON_LIBRARY and find the default both in x86 (tes…

…ted on ubuntu 12.10 64) and android
  • Loading branch information
mbernasocchi committed May 19, 2013
1 parent 6370aa4 commit f7f3e413b726024384235a3654d6b18d9ff073be
Showing with 4 additions and 3 deletions.
  1. +4 −3 cmake/FindPythonLibrary.cmake
@@ -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,6 +69,7 @@ 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)

@@ -109,4 +110,4 @@ else(EXISTS PYTHON_LIBRARY)
endif(PYTHONLIBRARY_FIND_REQUIRED)
endif(PYTHONLIBRARY_FOUND)

endif (EXISTS PYTHON_LIBRARY)
endif (EXISTS ${PYTHON_LIBRARY})

0 comments on commit f7f3e41

Please sign in to comment.
You can’t perform that action at this time.