From b3feda218b8efb2a93cbde2fcfaea60acbfc089a Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Thu, 3 Nov 2016 12:35:22 -0400
Subject: [PATCH] base: Bump CMake for improved add_custom_command

Improves cross-compilation support in add_custom_command by integrating

  https://gitlab.kitware.com/cmake/cmake/merge_requests/217

CMake Git master from 2016-11-03 (3.8-master).

Addresses #54
---
 common.docker | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/common.docker b/common.docker
index c594da8..1fbe521 100644
--- a/common.docker
+++ b/common.docker
@@ -5,10 +5,20 @@ RUN git clone "https://github.com/nojhan/liquidprompt.git" && \
 COPY imagefiles/.bashrc /root/
 
 WORKDIR /usr/src
-RUN curl -O https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz && \
-   tar xzf cmake-3.6.2-Linux-x86_64.tar.gz && \
-   cp -a cmake-3.6.2-Linux-x86_64/* /usr/ && \
-   rm -rf cmake-3.6.2-Linux-x86_64
+RUN git clone git://cmake.org/cmake.git CMake && \
+  cd CMake && \
+  git checkout ab2ae4823c3b60347825da4b851cd4e676f8bed1 && \
+  mkdir /usr/src/CMake-build && \
+  cd /usr/src/CMake-build && \
+  /usr/src/CMake/bootstrap \
+    --parallel=$(grep -c processor /proc/cpuinfo) \
+    --prefix=/usr && \
+  make -j$(grep -c processor /proc/cpuinfo) && \
+  ./bin/cmake \
+    -DCMAKE_BUILD_TYPE:STRING=Release \
+    -DCMAKE_USE_OPENSSL:BOOL=ON . && \
+  make install && \
+  cd .. && rm -rf CMake*
 
 RUN git clone "https://github.com/martine/ninja.git" && \
    cd ninja && \