Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Cmake pybullet fix"

Browse Source
This commit is contained in:
erwincoumans
2017-09-23 20:58:14 -07:00
committed by GitHub
parent a506879d6c
commit e95a15dabe
2 changed files with 8 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
build3/cmake/FindPythonLibs.cmake
View File

@@ -64,7 +64,7 @@ if(EXISTS "${PYTHON_INCLUDE_DIR}" AND EXISTS "${PYTHON_LIBRARY}")
else()
set(_PYTHON1_VERSIONS 1.6 1.5)
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
unset(_PYTHON_FIND_OTHER_VERSIONS)
if(PythonLibs_FIND_VERSION)
@@ -176,13 +176,12 @@ else()
FIND_LIBRARY(PYTHON_LIBRARY
NAMES ${_PYTHON_LIBRARY_NAMES}
PATH_SUFFIXES
"python${_PYTHON_SHORT_VERSION}/config"
"python${_PYTHON_SHORT_VERSION_NO_DOT}/config"
python${_PYTHON_SHORT_VERSION}/config
python${_PYTHON_SHORT_VERSION_NO_DOT}/config
PATHS
${_PYTHON_LIBRARY_DIR}
${_PYTHON_PREFIX}/lib
${_PYTHON_PREFIX}/libs
${_PYTHON_LIBRARY_DIR}/x86_64-linux-gnu/
${_PYTHON_PREFIX}/lib $
{_PYTHON_PREFIX}/libs
NO_DEFAULT_PATH)
if(WIN32)
@@ -255,10 +254,6 @@ set(PYTHON_LIBRARY_DEBUG "${PYTHON_DEBUG_LIBRARY}")
set(PYTHON_LIBRARY_RELEASE "${PYTHON_LIBRARY}")
include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
SELECT_LIBRARY_CONFIGURATIONS(PYTHON)
if(PYTHON_LIBRARY AND NOT PYTHON_LIBRARIES)
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
endif()
# SELECT_LIBRARY_CONFIGURATIONS() sets ${PREFIX}_FOUND if it has a library.
# Unset this, this prefix doesn't match the module prefix, they are different
# for historical reasons.