From 1579b6a707b919b54fc9c30a660bfd3e69ab5732 Mon Sep 17 00:00:00 2001 From: Andrew Hundt Date: Tue, 26 Sep 2017 15:49:35 -0400 Subject: [PATCH 1/2] CMakeLists.txt search for any python version by default --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d692e89b..46cd4ff15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -303,8 +303,8 @@ ENDIF() OPTION(BUILD_BULLET3 "Set when you want to build Bullet 3" ON) # Optional Python configuration # builds pybullet automatically if all the requirements are met -SET(PYTHON_VERSION_PYBULLET "2.7" CACHE STRING "Python version pybullet will use.") -SET(Python_ADDITIONAL_VERSIONS 2.7 2.7.3 2.7.12 3 3.0 3.1 3.2 3.3 3.4 3.5 3.6) +SET(PYTHON_VERSION_PYBULLET "" CACHE STRING "Python version pybullet will use.") +SET(Python_ADDITIONAL_VERSIONS 3 3.6 3.5 3.4 3.3 3.2 3.1 3.0 2.7 2.7.12 2.7.10 2.7.3 ) SET_PROPERTY(CACHE PYTHON_VERSION_PYBULLET PROPERTY STRINGS ${Python_ADDITIONAL_VERSIONS}) SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/build3/cmake ${CMAKE_MODULE_PATH}) OPTION(EXACT_PYTHON_VERSION "Require Python and match PYTHON_VERSION_PYBULLET exactly, e.g. 2.7.12" OFF) From 4810b9915539d1cc5a3d3dc1d5a3b16967d45f56 Mon Sep 17 00:00:00 2001 From: Andrew Hundt Date: Fri, 29 Sep 2017 17:38:40 -0400 Subject: [PATCH 2/2] Add special search paths for linux python libraries such as libpython3.5m.so --- build3/cmake/FindPythonLibs.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build3/cmake/FindPythonLibs.cmake b/build3/cmake/FindPythonLibs.cmake index b0bcd839c..aa53c72fc 100644 --- a/build3/cmake/FindPythonLibs.cmake +++ b/build3/cmake/FindPythonLibs.cmake @@ -124,7 +124,7 @@ else() STRING(REGEX REPLACE "^([0-9]+).*$" "\\1" _VERSION_MAJOR "${_CURRENT_VERSION}") STRING(REGEX REPLACE "^[0-9]+\\.([0-9]+).*$" "\\1" _VERSION_MINOR "${_CURRENT_VERSION}") - set(_PYTHON_NAMES python) + set(_PYTHON_NAMES ${PYTHON_EXECUTABLE} python) if (_CURRENT_VERSION MATCHES "^[0-9]+.*$") list(APPEND _PYTHON_NAMES "python${_VERSION_MAJOR}") @@ -172,7 +172,7 @@ else() if(NOT EXISTS "${PYTHON_LIBRARY}") set(_PYTHON_SHORT_VERSION_NO_DOT "${_PYTHON_MAJOR_VERSION}${_PYTHON_MINOR_VERSION}") - set(_PYTHON_LIBRARY_NAMES python${_PYTHON_SHORT_VERSION} python${_PYTHON_SHORT_VERSION_NO_DOT}) + set(_PYTHON_LIBRARY_NAMES python${_PYTHON_SHORT_VERSION} python${_PYTHON_SHORT_VERSION_NO_DOT} python${_PYTHON_SHORT_VERSION}m python${_PYTHON_SHORT_VERSION_NO_DOT}m) FIND_LIBRARY(PYTHON_LIBRARY NAMES ${_PYTHON_LIBRARY_NAMES} PATH_SUFFIXES