From 4108211ec80f82d84e04afbf48842f22e62b413f Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Mon, 18 Sep 2017 18:11:08 -0700 Subject: [PATCH 1/4] attempt to re-enable pybullet in cmake --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d568af5d1..d2ad176f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ addons: script: - echo "CXX="$CXX - echo "CC="$CC - - cmake . -DBUILD_PYBULLET=OFF -G"Unix Makefiles" #-DCMAKE_CXX_FLAGS=-Werror + - cmake . -DBUILD_PYBULLET=ON -G"Unix Makefiles" #-DCMAKE_CXX_FLAGS=-Werror - make -j8 - ctest -j8 --output-on-failure # Build again with double precision From 2d3cd8d0917ec05d77d154401eca2725e11a5f6f Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Mon, 18 Sep 2017 18:14:46 -0700 Subject: [PATCH 2/4] disable NUMPY build by default --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8eb1c0b44..88f7385b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -326,7 +326,7 @@ OPTION(BUILD_CLSOCKET "Set when you want to build apps with enet TCP networking IF(BUILD_PYBULLET) - OPTION(BUILD_PYBULLET_NUMPY "Set when you want to build pybullet with NumPy support" ON) + OPTION(BUILD_PYBULLET_NUMPY "Set when you want to build pybullet with NumPy support" OFF) OPTION(BUILD_PYBULLET_ENET "Set when you want to build pybullet with enet UDP networking support" ON) OPTION(BUILD_PYBULLET_CLSOCKET "Set when you want to build pybullet with enet TCP networking support" ON) From 420042c62869d2641073e31de939471d4c5d5248 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Tue, 19 Sep 2017 10:28:52 -0700 Subject: [PATCH 3/4] try to re-enable continuous integration --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 88f7385b7..c82e55091 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -317,7 +317,7 @@ IF(BUILD_PYBULLET) # first find the python interpreter FIND_PACKAGE(PythonInterp ${PYTHON_VERSION_PYBULLET} ${EXACT_PYTHON_VERSION_FLAG}) # python library should exactly match that of the interpreter - FIND_PACKAGE(PythonLibs ${PYTHON_VERSION_STRING} EXACT) + FIND_PACKAGE(PythonLibs) ENDIF() OPTION(BUILD_ENET "Set when you want to build apps with enet UDP networking support" ON) From 739728c8afb92657f5fe69cfb37368b2dabb8d1b Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Tue, 19 Sep 2017 10:50:24 -0700 Subject: [PATCH 4/4] revert to FIND_PACKAGE(PythonLibs), the new solution doesn't work with Travis --- CMakeLists.txt | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c82e55091..8e5f009df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -303,29 +303,14 @@ ENDIF() OPTION(BUILD_BULLET3 "Set when you want to build Bullet 3" ON) OPTION(BUILD_PYBULLET "Set when you want to build pybullet (Python bindings for Bullet)" OFF) -IF(BUILD_PYBULLET) - # 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 3 3.0 3.1 3.2 3.3 3.4 3.5 3.6) - 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.3" OFF) - IF(EXACT_PYTHON_VERSION) - set(EXACT_PYTHON_VERSION_FLAG EXACT REQUIRED) - ENDIF(EXACT_PYTHON_VERSION) - # first find the python interpreter - FIND_PACKAGE(PythonInterp ${PYTHON_VERSION_PYBULLET} ${EXACT_PYTHON_VERSION_FLAG}) - # python library should exactly match that of the interpreter - FIND_PACKAGE(PythonLibs) -ENDIF() OPTION(BUILD_ENET "Set when you want to build apps with enet UDP networking support" ON) OPTION(BUILD_CLSOCKET "Set when you want to build apps with enet TCP networking support" ON) IF(BUILD_PYBULLET) - + FIND_PACKAGE(PythonLibs) + OPTION(BUILD_PYBULLET_NUMPY "Set when you want to build pybullet with NumPy support" OFF) OPTION(BUILD_PYBULLET_ENET "Set when you want to build pybullet with enet UDP networking support" ON) OPTION(BUILD_PYBULLET_CLSOCKET "Set when you want to build pybullet with enet TCP networking support" ON)