kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FindPythonLibs: Use python executable prefix as a hint 

If PYTHON_EXECUTABLE is set, then we should look for the libs in the
same prefix, e.g. /usr/local/python -> /usr/local/lib, and on Win32
/Python34/python.exe -> /Python34/libs.
This commit is contained in:
David Gobbi 2015-09-17 08:22:27 -06:00 committed by Brad King
parent a9d32dffb9
commit f8bc4e1118
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Modules/FindPythonLibs.cmake
View File

@ -49,6 +49,23 @@
# (To distribute this file outside of CMake, substitute the full # (To distribute this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
# Use the executable's path as a hint
set(_Python_LIBRARY_PATH_HINT)
if(PYTHON_EXECUTABLE)
if(WIN32)
get_filename_component(_PREFIX ${PYTHON_EXECUTABLE} PATH)
if(_PREFIX)
set(_Python_LIBRARY_PATH_HINT ${_PREFIX}/libs)
endif()
else()
get_filename_component(_PREFIX ${PYTHON_EXECUTABLE} PATH)
get_filename_component(_PREFIX ${_PREFIX} PATH)
if(_PREFIX)
set(_Python_LIBRARY_PATH_HINT ${_PREFIX}/lib)
endif()
endif()
endif()
include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindFrameworks.cmake) include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindFrameworks.cmake)
# Search for the python framework on Apple. # Search for the python framework on Apple.
CMAKE_FIND_FRAMEWORKS(Python) CMAKE_FIND_FRAMEWORKS(Python)
@ -112,6 +129,7 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
if(WIN32) if(WIN32)
find_library(PYTHON_DEBUG_LIBRARY find_library(PYTHON_DEBUG_LIBRARY
NAMES python${_CURRENT_VERSION_NO_DOTS}_d python NAMES python${_CURRENT_VERSION_NO_DOTS}_d python
HINTS ${_Python_LIBRARY_PATH_HINT}
PATHS PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
@ -134,6 +152,8 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
python${_CURRENT_VERSION}m python${_CURRENT_VERSION}m
python${_CURRENT_VERSION}u python${_CURRENT_VERSION}u
python${_CURRENT_VERSION} python${_CURRENT_VERSION}
HINTS
${_Python_LIBRARY_PATH_HINT}
PATHS PATHS
${PYTHON_FRAMEWORK_LIBRARIES} ${PYTHON_FRAMEWORK_LIBRARIES}
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
@ -203,6 +223,7 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
endforeach() endforeach()
unset(_Python_INCLUDE_PATH_HINT) unset(_Python_INCLUDE_PATH_HINT)
unset(_Python_LIBRARY_PATH_HINT)
mark_as_advanced( mark_as_advanced(
PYTHON_DEBUG_LIBRARY PYTHON_DEBUG_LIBRARY