Skip to content

Commit

Permalink
BehaviorTree#2 Fix Conan install script
Browse files Browse the repository at this point in the history
Signed-off-by: Uilian Ries <uilianries@gmail.com>
  • Loading branch information
uilianries committed Dec 13, 2018
1 parent 2e24b37 commit a61340d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions conan/travis/install.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/bash

set -e
set -x
set -ex

if [[ "$(uname -s)" == 'Darwin' ]]; then
brew update || brew update
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down

0 comments on commit a61340d

Please sign in to comment.