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

cmake minor fixes

Browse Source
This commit is contained in:
Andrew Hundt
2017-05-21 09:32:00 -04:00
parent 655def023e
commit 1e83630c1d
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -267,7 +267,7 @@ ENDIF(EXACT_PYTHON_VERSION)
# first find the python interpreter # first find the python interpreter
FIND_PACKAGE(PythonInterp ${PYTHON_VERSION_PYBULLET} ${EXACT_PYTHON_VERSION_FLAG}) FIND_PACKAGE(PythonInterp ${PYTHON_VERSION_PYBULLET} ${EXACT_PYTHON_VERSION_FLAG})
# python library should exactly match that of the interpreter # python library should exactly match that of the interpreter
FIND_PACKAGE(PythonLibraries ${PYTHON_VERSION_STRING} EXACT) FIND_PACKAGE(PythonLibs ${PYTHON_VERSION_STRING} EXACT)
SET(DEFAULT_BUILD_PYBULLET OFF) SET(DEFAULT_BUILD_PYBULLET OFF)
IF(PYTHONLIBS_FOUND) IF(PYTHONLIBS_FOUND)
SET(DEFAULT_BUILD_PYBULLET ON) SET(DEFAULT_BUILD_PYBULLET ON)

3
build3/cmake/FindNumPy.cmake
View File

@@ -50,7 +50,8 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(NumPy REQUIRED_VARS PYTHON_NUMPY_INCLUDE_DIR PYTHON_NUMPY_VERSION find_package_handle_standard_args(NumPy REQUIRED_VARS PYTHON_NUMPY_INCLUDE_DIR PYTHON_NUMPY_VERSION
VERSION_VAR PYTHON_NUMPY_VERSION) VERSION_VAR PYTHON_NUMPY_VERSION)
if(PYTHON_NUMPY_FOUND) if(NUMPY_FOUND)
set(PYTHON_NUMPY_FOUND TRUE)
message(STATUS "NumPy ver. ${PYTHON_NUMPY_VERSION} found (include: ${PYTHON_NUMPY_INCLUDE_DIR})") message(STATUS "NumPy ver. ${PYTHON_NUMPY_VERSION} found (include: ${PYTHON_NUMPY_INCLUDE_DIR})")
endif() endif()

0
build3/cmake/FindPythonLibraries.cmake → build3/cmake/FindPythonLibs.cmake
View File