diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2020-03-30 05:18:03 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2020-04-05 20:45:56 +0300 |
| commit | c99539e111e70006c0895025c44520a93e046507 (patch) | |
| tree | 85e22836554eb7f85912a715845bad5533f962ba | |
| parent | Travis: more verbose & correct stress_test.sh (diff) | |
| download | math-server-c99539e111e70006c0895025c44520a93e046507.tar.gz math-server-c99539e111e70006c0895025c44520a93e046507.zip | |
update cmake-common
| -rw-r--r-- | .appveyor.yml | 5 | ||||
| -rw-r--r-- | .travis.yml | 18 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | client/Dockerfile | 3 | ||||
| m--------- | cmake | 0 | ||||
| -rw-r--r-- | server/Dockerfile | 3 |
6 files changed, 17 insertions, 14 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 894e2d0..83b61d9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -23,11 +23,12 @@ install: - git submodule update --init --recursive build_script: + - cd cmake - >- - "%python_exe%" cmake\cmake\build\ci\appveyor.py + "%python_exe%" -m project.ci.appveyor.cmake --install "%install_dir%" + --boost "%appveyor_boost_root%" -- - -D "BOOST_ROOT=%appveyor_boost_root%" -D ENABLE_TESTS=ON after_build: diff --git a/.travis.yml b/.travis.yml index 10e0c44..aee101a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ addons: env: global: - travis_boost_version=1.67.0 + boost_version=1.67.0 jobs: - configuration=Debug platform=x86 - configuration=Release platform=x86 @@ -25,25 +25,25 @@ env: # Tests fail to compile w/ Boost 1.66 also: # https://lists.boost.org/boost-bugs/2018/01/49711.php before_script: + - cd cmake - >- - ./cmake/boost/build/ci/travis.py - --link static + python3 -m project.ci.travis.boost -- - --with-filesystem --with-program_options --with-regex --with-test + --with-filesystem + --with-program_options + --with-regex + --with-test script: - >- - ./cmake/cmake/build/ci/travis.py + python3 -m project.ci.travis.cmake --install "$HOME/install" -- - -D "CMAKE_TOOLCHAIN_FILE=cmake/cmake/toolchains/gcc-$platform.cmake" - -D "BOOST_ROOT=$HOME/boost" - -D "BOOST_LIBRARYDIR=$HOME/boost/stage/$platform/$configuration/lib" -D ENABLE_TESTS=ON - "$HOME/install/bin/math-server-unit-tests" - "$HOME/install/bin/math-server-benchmarks" - - ./.ci/stress_test.sh + - ../.ci/stress_test.sh jobs: fast_finish: true diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b15286..db0e2dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ option(ENABLE_TESTS "build the tests") # C++17 is mandatory: set(CC_CXX_STANDARD 17) -include(cmake/cmake/common.cmake) +include(cmake/common.cmake) # AppVeyor builds w/ Visual Studio 2017 bombard me with stupid warnings otherwise: if(MSVC_VERSION GREATER_EQUAL "1910" AND MSVC_VERSION LESS "1920") diff --git a/client/Dockerfile b/client/Dockerfile index 640391b..858b954 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -10,7 +10,8 @@ COPY [".", "$src_dir"] RUN build_deps='boost-dev cmake g++ make python3' && \ apk add --no-cache $build_deps && \ - "$src_dir/cmake/cmake/build/build.py" \ + cd -- "$src_dir/cmake" && \ + python3 -m project.cmake.build \ --install /opt/math-server \ --configuration Release \ -- \ diff --git a/cmake b/cmake -Subproject 26e0acd8301b3ace7e649cf53a580ae8b70333f +Subproject 0f474b66fe1d6cfdb286deb1ef19e2b37e60d4e diff --git a/server/Dockerfile b/server/Dockerfile index 22364e8..99382c0 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -10,7 +10,8 @@ COPY [".", "$src_dir"] RUN build_deps='boost-dev cmake g++ make python3' && \ apk add --no-cache $build_deps && \ - "$src_dir/cmake/cmake/build/build.py" \ + cd -- "$src_dir/cmake" && \ + python3 -m project.cmake.build \ --install /opt/math-server \ --configuration Release \ -- \ |