diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2019-12-09 04:15:33 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2019-12-09 04:15:33 +0300 |
| commit | 72f488790b388b5b4cbab9d683e1b096b6f817c1 (patch) | |
| tree | 57c56978c45c7c6d6f80309878630ead39d56120 | |
| parent | set minimum CMake version (diff) | |
| download | math-server-72f488790b388b5b4cbab9d683e1b096b6f817c1.tar.gz math-server-72f488790b388b5b4cbab9d683e1b096b6f817c1.zip | |
AppVeyor/Travis: remove options also present in common.cmake
Diffstat (limited to '')
| -rw-r--r-- | .appveyor/build.ps1 | 4 | ||||
| -rwxr-xr-x | .travis/build.sh | 1 | ||||
| -rwxr-xr-x | .travis/build_boost.sh | 14 |
3 files changed, 8 insertions, 11 deletions
diff --git a/.appveyor/build.ps1 b/.appveyor/build.ps1 index cdacc8a..ea80b10 100644 --- a/.appveyor/build.ps1 +++ b/.appveyor/build.ps1 @@ -93,12 +93,10 @@ function Build-Project { mkdir $BuildDir cd $BuildDir - Invoke-Exe { cmake.exe -Wno-dev ` + Invoke-Exe { cmake.exe ` -G $Generator -A $Platform ` -D "BOOST_ROOT=$BoostDir" ` -D "BOOST_LIBRARYDIR=$BoostLibraryDir" ` - -D Boost_USE_STATIC_LIBS=ON ` - -D Boost_USE_STATIC_RUNTIME=ON ` -D ENABLE_TESTS=ON ` $ProjectDir } diff --git a/.travis/build.sh b/.travis/build.sh index 2e721f3..5c86ac0 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -16,7 +16,6 @@ main() { -D "CMAKE_CXX_STANDARD_LIBRARIES=-lpthread" \ -D "BOOST_ROOT=$boost_dir" \ -D "BOOST_LIBRARYDIR=$boost_librarydir" \ - -D Boost_USE_STATIC_LIBS=ON \ -D ENABLE_TESTS=ON \ "$TRAVIS_BUILD_DIR" cmake --build . -- -j diff --git a/.travis/build_boost.sh b/.travis/build_boost.sh index 9c757a5..94869ef 100755 --- a/.travis/build_boost.sh +++ b/.travis/build_boost.sh @@ -29,13 +29,13 @@ bootstrap() { build() { trap clean RETURN cd -- "$boost_dir" - ./b2 \ - "address-model=$address_model" \ - link=static \ - variant="$build_type" \ - "--stagedir=stage/$arch/$build_type" \ - --with-filesystem \ - --with-program_options \ + ./b2 \ + "address-model=$address_model" \ + link=static \ + variant="$build_type" \ + "--stagedir=stage/$arch/$build_type" \ + --with-filesystem \ + --with-program_options \ --with-test } |