diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2021-04-07 00:45:40 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2021-04-07 01:06:33 +0300 |
| commit | e10b7946da60677ddc54da7e75a7282c006f9a70 (patch) | |
| tree | 8b1c505cbe7d6e954ea9dace556b410f4ce6e55e | |
| parent | cmake: slight CMakeLists.txt refactoring (diff) | |
| download | math-server-e10b7946da60677ddc54da7e75a7282c006f9a70.tar.gz math-server-e10b7946da60677ddc54da7e75a7282c006f9a70.zip | |
Makefile: allow to override MATH_SERVER_TESTS
Diffstat (limited to '')
| -rw-r--r-- | .github/workflows/ci.yml | 1 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | client/Dockerfile | 2 | ||||
| -rw-r--r-- | server/Dockerfile | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce9c497..e2dcb23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,6 +41,7 @@ jobs: PLATFORM: '${{ matrix.platform }}' CONFIGURATION: '${{ matrix.configuration }}' BOOST_VERSION: 1.71.0 + CMAKE_FLAGS: -D MATH_SERVER_TESTS=ON defaults: run: shell: pwsh @@ -31,7 +31,7 @@ TOOLSET ?= auto CONFIGURATION ?= Debug BOOST_VERSION ?= 1.72.0 BOOST_LIBRARIES := --with-filesystem --with-program_options --with-regex --with-test -CMAKE_FLAGS ?= +CMAKE_FLAGS ?= -D MATH_SERVER_TESTS=ON this_dir := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) src_dir := $(this_dir) @@ -84,9 +84,9 @@ endif .PHONY: build build: ifdef CI - cd cmake && python3 -m project.ci.cmake --install -- -D MATH_SERVER_TESTS=ON $(CMAKE_FLAGS) + cd cmake && python3 -m project.ci.cmake --install -- $(CMAKE_FLAGS) else - cd cmake && python3 -m project.cmake.build --toolset '$(call escape,$(TOOLSET))' --configuration '$(call escape,$(CONFIGURATION))' --build '$(call escape,$(cmake_dir))' --install '$(call escape,$(DESTDIR))' --boost '$(call escape,$(boost_dir))' -- '$(call escape,$(src_dir))' -D MATH_SERVER_TESTS=ON $(CMAKE_FLAGS) + cd cmake && python3 -m project.cmake.build --toolset '$(call escape,$(TOOLSET))' --configuration '$(call escape,$(CONFIGURATION))' --build '$(call escape,$(cmake_dir))' --install '$(call escape,$(DESTDIR))' --boost '$(call escape,$(boost_dir))' -- '$(call escape,$(src_dir))' $(CMAKE_FLAGS) endif .PHONY: install diff --git a/client/Dockerfile b/client/Dockerfile index 2d6e1c2..8da5148 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -11,7 +11,7 @@ COPY [".", "$src_dir"] RUN build_deps='bash boost-dev cmake g++ make python3' && \ apk add --no-cache $build_deps && \ cd -- "$src_dir" && \ - make install CONFIGURATION=Release CMAKE_FLAGS='-D Boost_USE_STATIC_LIBS=OFF' + make install CONFIGURATION=Release CMAKE_FLAGS='-D MATH_SERVER_TESTS=ON -D Boost_USE_STATIC_LIBS=OFF' FROM base diff --git a/server/Dockerfile b/server/Dockerfile index c243edd..acb02e2 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -11,7 +11,7 @@ COPY [".", "$src_dir"] RUN build_deps='bash boost-dev cmake g++ make python3' && \ apk add --no-cache $build_deps && \ cd -- "$src_dir" && \ - make install CONFIGURATION=Release CMAKE_FLAGS='-D Boost_USE_STATIC_LIBS=OFF' + make install CONFIGURATION=Release CMAKE_FLAGS='-D MATH_SERVER_TESTS=ON -D Boost_USE_STATIC_LIBS=OFF' FROM base |