Skip to content

Commit

Permalink
Try to update cmake on Mac travis.
Browse files Browse the repository at this point in the history
  • Loading branch information
artemii235 committed Jul 5, 2018
1 parent 4523c5a commit f38a02f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
7 changes: 5 additions & 2 deletions .travis.yml
Expand Up @@ -18,11 +18,14 @@ before_install:

script:
- export VERSION=`echo "$(git tag -l --points-at HEAD)"`
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export THREAD_COUNT=`echo "$(nproc --all)"`; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export THREAD_COUNT=`echo "$(sysctl -n hw.physicalcpu)"`; fi
- mkdir build && cd build
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cmake -DMM_VERSION="$VERSION" -DCMAKE_C_COMPILER=/usr/bin/gcc-7 -DCMAKE_CXX_COMPILER=/usr/bin/g++-7 ..; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -DMM_VERSION="$VERSION" ..; fi
- cmake --build . --target marketmaker-mainnet -j $(nproc --all)
- cmake --build . --target marketmaker-testnet -j $(nproc --all)
- echo "cmake --build . --target marketmaker-mainnet -j $THREAD_COUNT"
- cmake --build . --target marketmaker-mainnet -j $THREAD_COUNT
- cmake --build . --target marketmaker-testnet -j $THREAD_COUNT

cache:
apt: true
Expand Down
7 changes: 2 additions & 5 deletions travis_cmake_mac.sh
@@ -1,9 +1,6 @@
#!/bin/bash
brew uninstall cmake --force
wget https://cmake.org/files/v3.12/cmake-3.12.0-rc2-Darwin-x86_64.tar.gz
tar -xvzf cmake-3.12.0-rc2-Darwin-x86_64.tar.gz
tar -xzf cmake-3.12.0-rc2-Darwin-x86_64.tar.gz
cp -r cmake-3.12.0-rc2-Darwin-x86_64/CMake.app/Contents/bin/* /usr/local/bin/
cp -r cmake-3.12.0-rc2-Darwin-x86_64/CMake.app/Contents/share/* /usr/local/share/
sysctl -n hw.physicalcpu
which cmake
cmake --version
cp -r cmake-3.12.0-rc2-Darwin-x86_64/CMake.app/Contents/share/* /usr/local/share/

0 comments on commit f38a02f

Please sign in to comment.