Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-25 22:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skip FindPythonLibsNew if PYTHONLIBS_FOUND is defined (fix #236)

Browse Source 
Also:
- Update documented result variables
- Remove long-ago-deprecated variable
This commit is contained in:
Dean Moldovan 2016-06-12 00:37:56 +02:00
parent 19d95ef09a
commit e782eb86e9
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/FindPythonLibsNew.cmake
View File

@ -7,14 +7,11 @@
# PYTHON_PREFIX - path to the Python installation # PYTHON_PREFIX - path to the Python installation
# PYTHON_LIBRARIES - path to the python library # PYTHON_LIBRARIES - path to the python library
# PYTHON_INCLUDE_DIRS - path to where Python.h is found # PYTHON_INCLUDE_DIRS - path to where Python.h is found
# PYTHON_MODULE_EXTENSION - lib extension, e.g. '.so' or '.pyd'
# PYTHON_MODULE_PREFIX - lib name prefix: usually an empty string
# PYTHON_SITE_PACKAGES - path to installation site-packages # PYTHON_SITE_PACKAGES - path to installation site-packages
# PYTHON_IS_DEBUG - whether the Python interpreter is a debug build # PYTHON_IS_DEBUG - whether the Python interpreter is a debug build
# #
# PYTHON_INCLUDE_PATH - path to where Python.h is found (deprecated)
#
# A function PYTHON_ADD_MODULE(<name> src1 src2 ... srcN) is defined
# to build modules for python.
#
# Thanks to talljimbo for the patch adding the 'LDVERSION' config # Thanks to talljimbo for the patch adding the 'LDVERSION' config
# variable usage. # variable usage.
@ -53,6 +50,9 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#============================================================================= #=============================================================================
if(PYTHONLIBS_FOUND)
return()
endif()
# Use the Python interpreter to find the libs. # Use the Python interpreter to find the libs.
if(PythonLibsNew_FIND_REQUIRED) if(PythonLibsNew_FIND_REQUIRED)
@ -165,10 +165,6 @@ else()
endif() endif()
endif() endif()
# For backward compatibility, set PYTHON_INCLUDE_PATH, but make it internal.
SET(PYTHON_INCLUDE_PATH "${PYTHON_INCLUDE_DIR}" CACHE INTERNAL
"Path to where Python.h is found (deprecated)")
MARK_AS_ADVANCED( MARK_AS_ADVANCED(
PYTHON_LIBRARY PYTHON_LIBRARY
PYTHON_INCLUDE_DIR PYTHON_INCLUDE_DIR