diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2019-12-15 01:04:56 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2019-12-15 01:04:56 +0300 |
| commit | 2d14e3f1588c5c82f9db28e0af05b722a3e8e133 (patch) | |
| tree | 3b4abd5c4f8233fe4bdef8965312ee8e247fa0e8 | |
| parent | update cmake-common (diff) | |
| download | math-server-2d14e3f1588c5c82f9db28e0af05b722a3e8e133.tar.gz math-server-2d14e3f1588c5c82f9db28e0af05b722a3e8e133.zip | |
update cmake-common
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| m--------- | cmake | 0 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index af4f5b5..5e22239 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,12 +22,12 @@ before_script: script: - |- - ./cmake/ci/build_travis.py \ + ./cmake/ci/build_travis.py \ --configuration "$configuration" \ - --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" \ + --install "$HOME/install" \ -- \ + -D "CMAKE_TOOLCHAIN_FILE=cmake/toolchains/gcc-$platform.cmake" \ + -D "BOOST_ROOT=$HOME/boost_1_71_0" \ + -D "BOOST_LIBRARYDIR=$HOME/boost_1_71_0/stage/$platform/$configuration/lib" \ -DENABLE_TESTS=ON - "$HOME/install/bin/math-server-unit-tests" diff --git a/appveyor.yml b/appveyor.yml index 7cc488c..5d33f5a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,7 +20,7 @@ install: - git submodule update --init --recursive build_script: - - '"%python_exe%" cmake\ci\build_appveyor.py --install "%install_dir%" --boost "%appveyor_boost_root%" --boost-librarydir "%appveyor_boost_librarydir%" -- -DENABLE_TESTS=ON' + - '"%python_exe%" cmake\ci\build_appveyor.py --install "%install_dir%" -- -D "BOOST_ROOT=%appveyor_boost_root%" -D "BOOST_LIBRARYDIR=%appveyor_boost_librarydir%" -D ENABLE_TESTS=ON' after_build: - 7z.exe a "math-server-%PLATFORM%-%CONFIGURATION%.zip" "%install_dir%" diff --git a/cmake b/cmake -Subproject fcfdc8abfd1998e4c65db107146d2c5d8462f44 +Subproject 86f069fe70a8ece2829953264ef372d0a661b45 |