Skip to content
This repository has been archived by the owner on Apr 17, 2019. It is now read-only.

Commit

Permalink
Upgrade CMake to version 3.11.4 (#1667)
Browse files Browse the repository at this point in the history
This allows the usage of FetchContent which is useful for CMake based dependencies

Signed-off-by: Nikita Alekseev <n.alekseev2104@gmail.com>
  • Loading branch information
nickaleks committed Aug 28, 2018
1 parent f80f9ed commit 5ff5de0
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright Soramitsu Co., Ltd. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.5.1)
cmake_minimum_required(VERSION 3.11.4)

find_program(CCACHE_PROGRAM ccache)
if(CCACHE_PROGRAM)
Expand Down
13 changes: 11 additions & 2 deletions docker/android/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# using fresh 18.04 as it contains suitable `cmake` in repos
FROM ubuntu:18.04

# number of concurrent threads during build
Expand All @@ -19,11 +18,21 @@ ENV DEPS_DIR="/iroha/dependencies"

RUN apt-get update && \
apt-get -y install --no-install-recommends git curl apt-utils software-properties-common libpthread-stubs0-dev libpcre3-dev \
unzip zip build-essential automake libtool ca-certificates ccache zlib1g-dev libcurl4-openssl-dev libc6-dbg cmake; \
unzip zip build-essential automake libtool ca-certificates ccache zlib1g-dev libcurl4-openssl-dev libc6-dbg; \
rm -rf /var/lib/apt/lists/*

RUN set -e; mkdir -p $DEPS_DIR/include $DEPS_DIR/lib

# install cmake 3.11.4
RUN set -e; \
git clone https://gitlab.kitware.com/cmake/cmake.git /tmp/cmake; \
(cd /tmp/cmake ; git checkout 316bd45439ad8ced6b31bcb10303a788038387ef); \
(cd /tmp/cmake ; /tmp/cmake/bootstrap --system-curl --parallel=${PARALLELISM} --enable-ccache); \
make -j${PARALLELISM} -C /tmp/cmake; \
make -C /tmp/cmake install; \
ldconfig; \
rm -rf /tmp/cmake

# boost 1.66
RUN set -e; \
curl -L -o /tmp/boost_1_66_0.tar.gz https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.gz; \
Expand Down
4 changes: 2 additions & 2 deletions docker/dependencies/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ RUN set -e; \
gcovr cppcheck doxygen graphviz graphviz-dev unzip zip; \
apt-get -y clean

# install cmake 3.10.2
# install cmake 3.11.4
RUN set -e; \
git clone https://gitlab.kitware.com/cmake/cmake.git /tmp/cmake; \
(cd /tmp/cmake ; git checkout c1e087a9d3af74299d7681c9f9de59e5977a1539); \
(cd /tmp/cmake ; git checkout 316bd45439ad8ced6b31bcb10303a788038387ef); \
(cd /tmp/cmake ; /tmp/cmake/bootstrap --system-curl --parallel=${PARALLELISM} --enable-ccache); \
make -j${PARALLELISM} -C /tmp/cmake; \
make -C /tmp/cmake install; \
Expand Down
4 changes: 2 additions & 2 deletions docker/develop/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ RUN set -e; \
gcovr cppcheck doxygen rsync graphviz graphviz-dev unzip zip; \
apt-get -y clean

# install cmake 3.10.2
# install cmake 3.11.4
RUN set -e; \
git clone https://gitlab.kitware.com/cmake/cmake.git /tmp/cmake; \
(cd /tmp/cmake ; git checkout c1e087a9d3af74299d7681c9f9de59e5977a1539); \
(cd /tmp/cmake ; git checkout 316bd45439ad8ced6b31bcb10303a788038387ef); \
(cd /tmp/cmake ; /tmp/cmake/bootstrap --system-curl --parallel=${PARALLELISM} --enable-ccache); \
make -j${PARALLELISM} -C /tmp/cmake; \
make -C /tmp/cmake install; \
Expand Down
12 changes: 6 additions & 6 deletions docs/source/guides/dependencies.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Installation on Ubuntu
CMake
-----

Minimum required version is 3.8, but we recommend to install the latest available version (3.10.3 at the moment).
Minimum required version is 3.11.4, but we recommend to install the latest available version (3.12.0 at the moment).

Installation on Ubuntu
^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -44,14 +44,14 @@ Here is how to build and install CMake from sources.

.. code-block:: shell
wget https://cmake.org/files/v3.10/cmake-3.10.3.tar.gz
tar -xvzf cmake-3.10.3.tar.gz
cd cmake-3.10.3/
wget https://cmake.org/files/v3.11/cmake-3.11.4.tar.gz
tar -xvzf cmake-3.11.4.tar.gz
cd cmake-3.11.4/
./configure
make
sudo make install
cmake --version
# cmake version 3.10.3
# cmake version 3.11.4
Installation on macOS
^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -60,7 +60,7 @@ Installation on macOS
brew install cmake
cmake --version
# cmake version 3.10.2
# cmake version 3.12.1
Git
---
Expand Down
2 changes: 1 addition & 1 deletion docs/source/guides/libraries/swift_ios.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ This tutorial was tested with the following environment:
- MacOS Sierra 10.12.6
- Xcode 9.2
- carthage 0.29.0
- cmake 3.11.0
- cmake 3.11.4
- iPhone 7 iOS 11.2 Simulator

Hyperledger Iroha iOS library
Expand Down
2 changes: 1 addition & 1 deletion shared_model/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright Soramitsu Co., Ltd. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.5.1)
cmake_minimum_required(VERSION 3.11.4)

project(shared_model C CXX)

Expand Down

0 comments on commit 5ff5de0

Please sign in to comment.