From 7205585d73c756c608529cb0305a26e834f7a831 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Thu, 9 Jan 2020 02:43:44 +0300
Subject: update cmake-common

---
 .travis.yml       | 23 ++++++++++++++---------
 CMakeLists.txt    |  2 +-
 appveyor.yml      |  8 +++++++-
 client/Dockerfile | 10 +++++-----
 cmake             |  2 +-
 server/Dockerfile | 10 +++++-----
 6 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7987056..cdf7b9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,16 +22,21 @@ env:
     - configuration=Release platform=x64
 
 before_script:
-  - ./cmake/ci/boost/build_travis.py -- link=static --with-filesystem --with-program_options --with-regex --with-test
+  - >-
+    ./cmake/boost/build/ci/travis.py
+    --link static
+    --
+    --with-filesystem --with-program_options --with-regex --with-test
 
 script:
-  - |-
-    ./cmake/ci/build_travis.py \
-        --install "$HOME/install" \
-        -- \
-        -D "CMAKE_TOOLCHAIN_FILE=cmake/toolchains/gcc-$platform.cmake" \
-        -D "BOOST_ROOT=$HOME/boost_1_71_0" \
-        -D "BOOST_LIBRARYDIR=$HOME/boost_1_71_0/stage/$platform/$configuration/lib" \
-        -D ENABLE_TESTS=ON
+  - >-
+    ./cmake/cmake/build/ci/travis.py
+    --install "$HOME/install"
+    --
+    -D "CMAKE_TOOLCHAIN_FILE=cmake/cmake/toolchains/gcc-$platform.cmake"
+    -D "BOOST_ROOT=$HOME/boost_1_71_0"
+    -D "BOOST_LIBRARYDIR=$HOME/boost_1_71_0/stage/$platform/$configuration/lib"
+    -D ENABLE_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..9b15286 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/common.cmake)
+include(cmake/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/appveyor.yml b/appveyor.yml
index d18557f..d013257 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,7 +20,13 @@ install:
   - git submodule update --init --recursive
 
 build_script:
-  - '"%python_exe%" cmake\ci\build_appveyor.py --install "%install_dir%" -- -D "BOOST_ROOT=%appveyor_boost_root%" -D "BOOST_LIBRARYDIR=%appveyor_boost_librarydir%" -D ENABLE_TESTS=ON'
+  - >-
+    "%python_exe%" cmake\cmake\build\ci\appveyor.py
+    --install "%install_dir%"
+    --
+    -D "BOOST_ROOT=%appveyor_boost_root%"
+    -D "BOOST_LIBRARYDIR=%appveyor_boost_librarydir%"
+    -D ENABLE_TESTS=ON
 
 after_build:
   - 7z.exe a "%APPVEYOR_PROJECT_NAME%-%PLATFORM%-%CONFIGURATION%.zip" "%install_dir%"
diff --git a/client/Dockerfile b/client/Dockerfile
index 0ae14f1..349e240 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -10,13 +10,13 @@ COPY [".", "$src_dir"]
 
 RUN build_deps='boost-dev cmake g++ make python3' && \
     apk add --no-cache $build_deps && \
-    "$src_dir/cmake/ci/build.py" \
-        --src "$src_dir" \
+    "$src_dir/cmake/cmake/build/build.py" \
         --install /usr/local \
-        --clean \
         --configuration Release \
-        -- -D ENABLE_TESTS=ON \
-        -- -D Boost_USE_STATIC_LIBS=OFF && \
+        -- \
+        "$src_dir" \
+        -D ENABLE_TESTS=ON \
+        -D Boost_USE_STATIC_LIBS=OFF && \
     rm -rf -- "$src_dir" && \
     apk del --purge --rdepends $build_deps && \
     runtime_deps='boost-filesystem boost-program_options boost-regex boost-unit_test_framework libstdc++' && \
diff --git a/cmake b/cmake
index 864fe9e..d83b675 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 864fe9e88734339852f26dc634e9d705c43135ea
+Subproject commit d83b675f53bd18204b1f07105b3944cc9756e7d1
diff --git a/server/Dockerfile b/server/Dockerfile
index aa0f75e..609c1ff 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -10,13 +10,13 @@ COPY [".", "$src_dir"]
 
 RUN build_deps='boost-dev cmake g++ make python3' && \
     apk add --no-cache $build_deps && \
-    "$src_dir/cmake/ci/build.py" \
-        --src "$src_dir" \
+    "$src_dir/cmake/cmake/build/build.py" \
         --install /usr/local \
-        --clean \
         --configuration Release \
-        -- -D ENABLE_TESTS=ON \
-        -- -D Boost_USE_STATIC_LIBS=OFF && \
+        -- \
+        "$src_dir" \
+        -D ENABLE_TESTS=ON \
+        -D Boost_USE_STATIC_LIBS=OFF && \
     rm -rf -- "$src_dir" && \
     apk del --purge --rdepends $build_deps && \
     runtime_deps='boost-filesystem boost-program_options boost-regex boost-unit_test_framework libstdc++' && \
-- 
cgit v1.2.3