From 02c769a40d5aae9bc51fa4a70808fe08dfd0e8bf Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sun, 14 May 2017 18:55:53 -0400 Subject: [PATCH] Add back rigidCube to the in-source build list (#883) --- CMakeLists.txt | 1 + ci/install.sh | 3 +-- examples/rigidCubes/Main.cpp | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e37cb808a6b64..44ec32bbb0cbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,6 +272,7 @@ if(TARGET dart) dart_add_example(examples/mixedChain dart dart-utils-urdf dart-gui) dart_add_example(examples/operationalSpaceControl dart dart-utils-urdf dart-gui) dart_add_example(examples/rigidChain dart dart-utils-urdf dart-gui) + dart_add_example(examples/rigidCubes dart dart-utils-urdf dart-gui) dart_add_example(examples/rigidLoop dart dart-utils-urdf dart-gui) dart_add_example(examples/rigidShapes dart dart-utils-urdf dart-gui) dart_add_example(examples/simpleFrames dart dart-utils-urdf dart-gui) diff --git a/ci/install.sh b/ci/install.sh index bbad659f0374c..4effc63f0e1c1 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -1,5 +1,4 @@ -if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$COMPILER" = "CLANG" ]; then exit; fi +if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$COMPILER" = "CLANG" ]; then exit; fi if [ "$TRAVIS_OS_NAME" = "linux" ]; then 'ci/install_linux.sh' ; fi if [ "$TRAVIS_OS_NAME" = "osx" ]; then 'ci/install_osx.sh' ; fi - diff --git a/examples/rigidCubes/Main.cpp b/examples/rigidCubes/Main.cpp index c9075071ff431..eadb55d3526ed 100644 --- a/examples/rigidCubes/Main.cpp +++ b/examples/rigidCubes/Main.cpp @@ -32,13 +32,15 @@ #include #include +#include #include "MyWindow.hpp" -int main(int argc, char* argv[]) { +int main(int argc, char* argv[]) +{ // create and initialize the world dart::simulation::WorldPtr myWorld - = dart::utils::SkelParser::readWorld("file://sample/skel/cubes.skel"); + = dart::utils::SkelParser::readWorld("dart://sample/skel/cubes.skel"); assert(myWorld != nullptr); Eigen::Vector3d gravity(0.0, -9.81, 0.0); myWorld->setGravity(gravity);