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

Add special search paths for linux python libraries such as libpython3.5m.so

Browse Source
This commit is contained in:
Andrew Hundt
2017-09-29 17:38:40 -04:00
parent 96ee22eeaa
commit 4810b99155
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build3/cmake/FindPythonLibs.cmake
View File

@@ -124,7 +124,7 @@ else()
STRING(REGEX REPLACE "^([0-9]+).*$" "\\1" _VERSION_MAJOR "${_CURRENT_VERSION}") STRING(REGEX REPLACE "^([0-9]+).*$" "\\1" _VERSION_MAJOR "${_CURRENT_VERSION}")
STRING(REGEX REPLACE "^[0-9]+\\.([0-9]+).*$" "\\1" _VERSION_MINOR "${_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]+.*$") if (_CURRENT_VERSION MATCHES "^[0-9]+.*$")
list(APPEND _PYTHON_NAMES "python${_VERSION_MAJOR}") list(APPEND _PYTHON_NAMES "python${_VERSION_MAJOR}")
@@ -172,7 +172,7 @@ else()
if(NOT EXISTS "${PYTHON_LIBRARY}") if(NOT EXISTS "${PYTHON_LIBRARY}")
set(_PYTHON_SHORT_VERSION_NO_DOT "${_PYTHON_MAJOR_VERSION}${_PYTHON_MINOR_VERSION}") 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 FIND_LIBRARY(PYTHON_LIBRARY
NAMES ${_PYTHON_LIBRARY_NAMES} NAMES ${_PYTHON_LIBRARY_NAMES}
PATH_SUFFIXES PATH_SUFFIXES