From dd7232b23cb9f14c11d96200b659155d836ab1e1 Mon Sep 17 00:00:00 2001 From: Henry Fredrick Schreiner Date: Tue, 9 Apr 2019 19:58:05 +0200 Subject: [PATCH] Update 3.14.0 -> 3.14.1 --- .gitlab-ci.yml | 2 +- CONTRIBUTING.md | 2 +- chapters/basics/structure.md | 2 +- chapters/intro/installing.md | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f8f28b..e39304b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ test_code: stage: test before_script: - mkdir -p $HOME/.local - - curl -s "https://cmake.org/files/v3.14/cmake-3.14.0-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C $HOME/.local + - curl -s "https://cmake.org/files/v3.14/cmake-3.14.1-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C $HOME/.local - export PATH=$HOME/.local/bin:$PATH script: - mkdir -p build diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 936c14d..28e4990 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ Thanks for considering a contribution! By making a merge request you are agreeing -to submit your changes under the original license of this material. \ No newline at end of file +to submit your changes under the original license of this material. diff --git a/chapters/basics/structure.md b/chapters/basics/structure.md index 4b07d4a..7a4bfa1 100644 --- a/chapters/basics/structure.md +++ b/chapters/basics/structure.md @@ -57,4 +57,4 @@ file(TO_CMAKE_PATH "${PROJECT_BINARY_DIR}/CMakeLists.txt" LOC_PATH) if(EXISTS "${LOC_PATH}") message(FATAL_ERROR "You cannot build in a source directory (or any directory with a CMakeLists.txt file). Please make a build subdirectory. Feel free to remove CMakeCache.txt and CMakeFiles.") endif() -``` \ No newline at end of file +``` diff --git a/chapters/intro/installing.md b/chapters/intro/installing.md index 14bd52d..3d1f4d3 100644 --- a/chapters/intro/installing.md +++ b/chapters/intro/installing.md @@ -13,13 +13,13 @@ You can [download CMake from KitWare][cmake-download]. This is how you'll probab On Linux, there are binaries provided, but you'll need to pick an install location. If you already use `~/.local` for user-space packages, the following single line command[^1] will get CMake for you [^2]: {% term %} -~ $ wget -qO- "https://cmake.org/files/v3.14/cmake-3.14.0-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C ~/.local +~ $ wget -qO- "https://cmake.org/files/v3.14/cmake-3.14.1-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C ~/.local {% endterm %} If you just want a local folder with CMake only: {% term %} -~ $ mkdir -p cmake-3.14 && wget -qO- "https://cmake.org/files/v3.14/cmake-3.14.0-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C cmake-3.14 +~ $ mkdir -p cmake-3.14 && wget -qO- "https://cmake.org/files/v3.14/cmake-3.14.1-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C cmake-3.14 ~ $ export PATH=`pwd`/cmake-3.14/bin:$PATH {% endterm %} @@ -28,7 +28,7 @@ You'll obviously want to append to the PATH every time you start a new terminal, And, if you want a system install, install to `/usr/local`; this is an excellent choice in a Docker container, for example on GitLab CI. Do not try it on a non-containerized system. {% term %} -docker $ wget -qO- "https://cmake.org/files/v3.14/cmake-3.14.0-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local +docker $ wget -qO- "https://cmake.org/files/v3.14/cmake-3.14.1-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local {% endterm %}