From a61340d63d1b7b68e8d75bfe10cdc77490b8f235 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Thu, 13 Dec 2018 12:37:06 -0200 Subject: [PATCH] #2 Fix Conan install script Signed-off-by: Uilian Ries --- conan/travis/install.sh | 3 +-- conanfile.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/conan/travis/install.sh b/conan/travis/install.sh index 2017e5e1e..f0174ac2e 100755 --- a/conan/travis/install.sh +++ b/conan/travis/install.sh @@ -1,7 +1,6 @@ #!/bin/bash -set -e -set -x +set -ex if [[ "$(uname -s)" == 'Darwin' ]]; then brew update || brew update diff --git a/conanfile.py b/conanfile.py index 05b6efa18..311dca7a9 100644 --- a/conanfile.py +++ b/conanfile.py @@ -48,7 +48,7 @@ def build(self): """project(behaviortree_cpp) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup()""") - # INFO (uilian): zmq could requires libsodium + # INFO (uilian): zmq could require libsodium tools.replace_in_file("CMakeLists.txt", "BEHAVIOR_TREE_EXTERNAL_LIBRARIES zmq", "BEHAVIOR_TREE_EXTERNAL_LIBRARIES ${CONAN_LIBS}")