diff --git a/scripts/CI/configure_cmake.sh b/scripts/CI/configure_cmake.sh index 1b57e0dfe..2c7b0dcc5 100755 --- a/scripts/CI/configure_cmake.sh +++ b/scripts/CI/configure_cmake.sh @@ -66,6 +66,10 @@ if [[ $WITH_DEBUG == true ]] ; then ARGS="$ARGS -DCMAKE_BUILD_TYPE=Debug" fi +if [[ $CI_OS_NAME == "osx" ]] ; then + ARGS="$ARGS -DUSE_LEVELDB=OFF"; +fi + echo "ARGS = ${ARGS}." cmake .. $ARGS diff --git a/scripts/osx/install_deps.sh b/scripts/osx/install_deps.sh index 3d53d4062..f9b38176d 100755 --- a/scripts/osx/install_deps.sh +++ b/scripts/osx/install_deps.sh @@ -1,11 +1,15 @@ #!/bin/bash -brew_packages="openblas snappy leveldb gflags glog szip lmdb hdf5 opencv protobuf boost cmake viennacl" +brew_packages="openblas snappy leveldb gflags glog libaec lmdb hdf5 opencv protobuf boost cmake viennacl" for pkg in $brew_packages do echo "brew install $pkg || brew upgrade $pkg" brew install "$pkg" || brew upgrade "$pkg" done +# fix for caffe +brew uninstall --force caffe +brew install --build-from-source caffe + # with Python pycaffe needs dependencies built from source #brew install --build-from-source --with-python -vd protobuf #brew install --build-from-source -vd boost boost-python