Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

CMake should find python now without manual options being set on linux.

Browse Source 
cmake on *nix detects python ABI flags for debug and release mode.
searches /usr /usr/local /opt/py32
This commit is contained in:
Campbell Barton
2011-03-10 00:25:35 +00:00
parent 2336612075
commit f3a455fd22
2 changed files with 81 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
CMakeLists.txt
View File

@@ -265,43 +265,19 @@ if(UNIX AND NOT APPLE)
if(WITH_PYTHON) if(WITH_PYTHON)
# No way to set py31. remove for now. # No way to set py32. remove for now.
# find_package(PythonLibs) # find_package(PythonLibs)
# set(PYTHON_BINARY python) # not used yet
set(PYTHON /usr) # defines...
# ABI can be any of these chars in this order 'dmu', debug/pymalloc/unicode # PYTHON_VERSION
# TODO, detect available ABI's, may want to make this a module and detect this better # PYTHON_INCLUDE_DIRS
if(CMAKE_BUILD_TYPE STREQUAL Debug) # PYTHON_LIBRARY
set(PYTHON_ABI_FLAGS "d") # PYTHON_LIBPATH
else() # PYTHON_LINKFLAGS
set(PYTHON_ABI_FLAGS "m")
endif()
set(PYTHON_VERSION 3.2 CACHE STRING "") include(build_files/cmake/FindPythonLibsUnix.cmake)
mark_as_advanced(PYTHON_VERSION)
set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
mark_as_advanced(PYTHON_INCLUDE_DIRS)
set(PYTHON_LIBRARY "python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
mark_as_advanced(PYTHON_LIBRARY)
set(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
mark_as_advanced(PYTHON_LIBPATH)
# find_package(PythonInterp) # not used yet
# set(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
set(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
mark_as_advanced(PYTHON_LINKFLAGS)
find_file(
_Found_PYTHON_H
Python.h
${PYTHON_INCLUDE_DIRS}
)
if(NOT _Found_PYTHON_H)
message(FATAL_ERROR "Python.h not found in ${PYTHON_INCLUDE_DIRS}")
endif()
endif() endif()
if(WITH_SDL) if(WITH_SDL)

72
build_files/cmake/FindPythonLibsUnix.cmake Normal file
View File

@@ -0,0 +1,72 @@
# - Find python libraries
#
# PYTHON_VERSION
# PYTHON_INCLUDE_DIRS
# PYTHON_LIBRARY
# PYTHON_LIBPATH
# PYTHON_LINKFLAGS
#=============================================================================
set(PYTHON_VERSION 3.2 CACHE STRING "")
mark_as_advanced(PYTHON_VERSION)
set(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
mark_as_advanced(PYTHON_LINKFLAGS)
set(_Python_ABI_FLAGS
"m;mu;u; ")
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
set(_Python_PATHS
"/opt/py${_PYTHON_VERSION_NO_DOTS}" "/usr" "/usr/local")
if(NOT DEFINED PYTHON_INCLUDE_DIRS)
message(STATUS "Looking for include Python.h")
set(_Found_PYTHON_H OFF)
foreach(_CURRENT_PATH ${_Python_PATHS})
foreach(_CURRENT_ABI_FLAGS ${_Python_ABI_FLAGS})
if(CMAKE_BUILD_TYPE STREQUAL Debug)
set(_CURRENT_ABI_FLAGS "d${_CURRENT_ABI_FLAGS}")
endif()
string(REPLACE " " "" _CURRENT_ABI_FLAGS ${_CURRENT_ABI_FLAGS})
set(_Python_HEADER "${_CURRENT_PATH}/include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}/Python.h")
if(EXISTS ${_Python_HEADER})
message(STATUS "Checking for header: ${_Python_HEADER} - found")
set(_Found_PYTHON_H ON)
set(PYTHON ${_CURRENT_PATH})
set(PYTHON_ABI_FLAGS ${_CURRENT_ABI_FLAGS})
break()
else()
message(STATUS "Checking for header: ${_Python_HEADER}")
endif()
endforeach()
if(_Found_PYTHON_H)
break()
endif()
endforeach()
if(NOT _Found_PYTHON_H)
message(FATAL_ERROR "Python.h not found")
endif()
endif()
#=============================================================================
# now the python versions are found
set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
mark_as_advanced(PYTHON_INCLUDE_DIRS)
set(PYTHON_LIBRARY "python${PYTHON_VERSION}${PYTHON_ABI_FLAGS}" CACHE STRING "")
mark_as_advanced(PYTHON_LIBRARY)
set(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
mark_as_advanced(PYTHON_LIBPATH)
# set(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
if(NOT EXISTS "${PYTHON_INCLUDE_DIRS}/Python.h")
message(FATAL_ERROR " Missing python header: ${PYTHON_INCLUDE_DIRS}/Python.h")
endif()