From 16ca6c1cf2a570c7814e17a2e85909165452c145 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Fri, 13 Dec 2019 23:35:57 +0300 Subject: update cmake-common --- .travis.yml | 4 ++-- cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f79910c..af4f5b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ env: - configuration=Release platform=x64 before_script: - - ./cmake/ci/boost/build_travis.py --with filesystem program_options test --link=static + - ./cmake/ci/boost/build_travis.py link=static --with-filesystem --with-program_options --with-test script: - |- @@ -27,7 +27,7 @@ script: --install "$HOME/install" \ --toolchain ./cmake/toolchains/gcc-$platform.cmake \ --boost "$HOME/boost_1_71_0" \ - --boost-librarydir "$HOME/boost_1_71_0/stage/$platform/${configuration,,}/lib" \ + --boost-librarydir "$HOME/boost_1_71_0/stage/$platform/$configuration/lib" \ -- \ -DENABLE_TESTS=ON - "$HOME/install/bin/math-server-unit-tests" diff --git a/cmake b/cmake index b00ae22..fcfdc8a 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit b00ae22060acf80467e981d6138aa14de897785d +Subproject commit fcfdc8abfd1998e4c65db107146d2c5d8462f447 -- cgit v1.2.3