diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2019-12-09 05:44:10 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2019-12-09 05:44:10 +0300 |
| commit | a9c8bf6a19d5b4863a597a6723c6355031a61863 (patch) | |
| tree | 13c764e50fd1c18713ae51eddfa7cdc82c244663 | |
| parent | update cmake-common (diff) | |
| download | math-server-a9c8bf6a19d5b4863a597a6723c6355031a61863.tar.gz math-server-a9c8bf6a19d5b4863a597a6723c6355031a61863.zip | |
CC_CXX_STANDARD -> CMakeLists.txt
| -rw-r--r-- | .appveyor/build.ps1 | 1 | ||||
| -rwxr-xr-x | .travis/build.sh | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | client/Dockerfile | 1 | ||||
| -rw-r--r-- | server/Dockerfile | 1 |
5 files changed, 3 insertions, 4 deletions
diff --git a/.appveyor/build.ps1 b/.appveyor/build.ps1 index 20e67c4..ea80b10 100644 --- a/.appveyor/build.ps1 +++ b/.appveyor/build.ps1 @@ -97,7 +97,6 @@ function Build-Project { -G $Generator -A $Platform ` -D "BOOST_ROOT=$BoostDir" ` -D "BOOST_LIBRARYDIR=$BoostLibraryDir" ` - -D CC_CXX_STANDARD=17 ` -D ENABLE_TESTS=ON ` $ProjectDir } diff --git a/.travis/build.sh b/.travis/build.sh index 0e36ca2..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 CC_CXX_STANDARD=17 \ -D ENABLE_TESTS=ON \ "$TRAVIS_BUILD_DIR" cmake --build . -- -j diff --git a/CMakeLists.txt b/CMakeLists.txt index 11ee856..0c9c0a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,9 @@ project(math_server CXX) option(ENABLE_TESTS "build the tests") +# C++17 is mandatory: +set(CC_CXX_STANDARD 17) + include(cmake/common.cmake) add_subdirectory(client) diff --git a/client/Dockerfile b/client/Dockerfile index fe27a79..ab1424b 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -24,7 +24,6 @@ RUN cmake -G "Unix Makefiles" \ -D CMAKE_BUILD_TYPE=RelWithDebInfo \ -D CMAKE_CXX_STANDARD_LIBRARIES="-lpthread" \ -D ENABLE_TESTS=ON \ - -D CC_CXX_STANDARD=17 \ /tmp/src && \ cmake --build test && \ ./test/unit_tests/unit_tests --log_level=all && \ diff --git a/server/Dockerfile b/server/Dockerfile index dd81c4d..951937e 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -24,7 +24,6 @@ RUN cmake -G "Unix Makefiles" \ -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_CXX_STANDARD_LIBRARIES="-lpthread" \ -D ENABLE_TESTS=ON \ - -D CC_CXX_STANDARD=17 \ /tmp/src && \ cmake --build test && \ ./test/unit_tests/unit_tests --log_level=all && \ |