From 9dec0cff5b6a7b8ea68c43fc34864da84d5c04ee Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Mon, 30 Mar 2020 12:11:22 +0300
Subject: update cmake-common

---
 .appveyor.yml  |  5 +++--
 .travis.yml    | 15 ++++++---------
 CMakeLists.txt |  2 +-
 cmake          |  2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 10ab20d..838bd02 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -31,12 +31,13 @@ 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 "AES_TOOLS_ASM=%use_asm%"
-    -D "BOOST_ROOT=%appveyor_boost_root%"
 
 after_build:
   - 7z.exe a "%APPVEYOR_PROJECT_NAME%-%PLATFORM%-%CONFIGURATION%.zip" "%install_dir%"
diff --git a/.travis.yml b/.travis.yml
index ecb2788..967bbf5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ addons:
 
 env:
   global:
-    - travis_boost_version=1.71.0
+    - boost_version=1.71.0
   jobs:
     - configuration=Debug   platform=x86
     - configuration=Release platform=x86
@@ -21,20 +21,17 @@ jobs:
   fast_finish: true
 
 before_script:
+  - cd cmake
   - >-
-    ./cmake/boost/build/ci/travis.py
-    --link static
+    python3 -m project.ci.travis.boost
+    --mingw
     --
-    --user-config="$TRAVIS_BUILD_DIR/cmake/boost/toolchains/mingw-w64-$platform.jam"
     --with-filesystem
     --with-program_options
     --with-system
 
 script:
   - >-
-    ./cmake/cmake/build/ci/travis.py
+    python3 -m project.ci.travis.cmake
     --install "$HOME/install"
-    --
-    -D "CMAKE_TOOLCHAIN_FILE=cmake/cmake/toolchains/mingw-w64-$platform.cmake"
-    -D "BOOST_ROOT=$HOME/boost"
-    -D "BOOST_LIBRARYDIR=$HOME/boost/stage/$platform/$configuration/lib"
+    --mingw
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d581426..232aeb7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5) # for Boost::* imported targets
 
 project(aes_tools C CXX)
 
-include(cmake/cmake/common.cmake)
+include(cmake/common.cmake)
 
 add_subdirectory(aes)
 add_subdirectory(aesxx)
diff --git a/cmake b/cmake
index e982dcf..0f474b6 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit e982dcf32672453f6ac22d59325260504cb130ea
+Subproject commit 0f474b66fe1d6cfdb286deb1ef19e2b37e60d4ee
-- 
cgit v1.2.3