diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2020-10-04 22:43:39 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2020-10-04 22:43:39 +0300 |
| commit | c497f7ee387ea81ad47854015899beba0d6efbf1 (patch) | |
| tree | c7e49bba4889c30c1eea25b22c955d9d9e6ae95d | |
| parent | can't believe Boost::disable_autolinking isn't everywhere (diff) | |
| download | math-server-c497f7ee387ea81ad47854015899beba0d6efbf1.tar.gz math-server-c497f7ee387ea81ad47854015899beba0d6efbf1.zip | |
cmake: ENABLE_TESTS -> MATH_SERVER_TESTS
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | client/Dockerfile | 2 | ||||
| -rw-r--r-- | server/Dockerfile | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 83b61d9..7789d5d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -29,7 +29,7 @@ build_script: --install "%install_dir%" --boost "%appveyor_boost_root%" -- - -D ENABLE_TESTS=ON + -D MATH_SERVER_TESTS=ON after_build: - 7z.exe a "%APPVEYOR_PROJECT_NAME%-%PLATFORM%-%CONFIGURATION%.zip" "%install_dir%" diff --git a/.travis.yml b/.travis.yml index 658d912..13a5f95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ script: python3 -m project.ci.travis.cmake --install "$HOME/install" -- - -D ENABLE_TESTS=ON + -D MATH_SERVER_TESTS=ON - "$HOME/install/bin/math-server-unit-tests" - "$HOME/install/bin/math-server-benchmarks" diff --git a/CMakeLists.txt b/CMakeLists.txt index db0e2dc..8362ad2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.8) # for C++17 project(math_server CXX) -option(ENABLE_TESTS "build the tests") +option(MATH_SERVER_TESTS "build the tests") # C++17 is mandatory: set(CC_CXX_STANDARD 17) @@ -30,7 +30,7 @@ endif() add_subdirectory(client) add_subdirectory(server) -if(ENABLE_TESTS) +if(MATH_SERVER_TESTS) set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Suppressing benchmark's tests" FORCE) set(BENCHMARK_ENABLE_INSTALL OFF CACHE BOOL "Don't install benchmark the library" FORCE) add_subdirectory("3rdparty/google/benchmark") diff --git a/client/Dockerfile b/client/Dockerfile index 858b954..c2969ea 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -16,7 +16,7 @@ RUN build_deps='boost-dev cmake g++ make python3' && \ --configuration Release \ -- \ "$src_dir" \ - -D ENABLE_TESTS=ON \ + -D MATH_SERVER_TESTS=ON \ -D Boost_USE_STATIC_LIBS=OFF FROM base diff --git a/server/Dockerfile b/server/Dockerfile index 99382c0..f19c283 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -16,7 +16,7 @@ RUN build_deps='boost-dev cmake g++ make python3' && \ --configuration Release \ -- \ "$src_dir" \ - -D ENABLE_TESTS=ON \ + -D MATH_SERVER_TESTS=ON \ -D Boost_USE_STATIC_LIBS=OFF FROM base |