Skip to content

Commit

Permalink
Issue #35: Emscripten: Update Cmake to 3.12.2
Browse files Browse the repository at this point in the history
  • Loading branch information
trzecieu committed Dec 7, 2018
1 parent 2f67f19 commit eec3e8c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions docker/trzeci/emscripten/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ RUN echo "\n## Start building" \
&& apt-get -qq -y update && apt-get -qq install -y --no-install-recommends -t jessie-backports openjdk-8-jre-headless \
\
&& echo "\n## Installing CMake" \
&& wget https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.sh -q \
&& wget https://cmake.org/files/v3.12/cmake-3.12.2-Linux-x86_64.sh -q \
&& mkdir /opt/cmake \
&& printf "y\nn\n" | sh cmake-3.7.2-Linux-x86_64.sh --prefix=/opt/cmake > /dev/null \
&& printf "y\nn\n" | sh cmake-3.12.2-Linux-x86_64.sh --prefix=/opt/cmake > /dev/null \
&& rm -fr cmake*.sh /opt/cmake/doc \
&& rm -fr /opt/cmake/bin/cmake-gui \
&& rm -fr /opt/cmake/bin/ccmake \
Expand Down
1 change: 1 addition & 0 deletions emscripten.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ Helper command: `./build compile trzeci/emscripten:sdk-tag-1.37.17-64bit` (where
* **Docker: emscripten-slim**: https://hub.docker.com/r/trzeci/emscripten-slim/

## History
* **1.38.22** [#35](https://github.com/asRIA/emscripten-docker/issues/35) upgrade to `cmake` 3.12.2
* **1.38.9** `/emsdk_portable` will be preserved as a git repos (with valid version of changeset)
* **1.38.7** Version removed due problems with [emsdk](https://github.com/juj/emsdk/pull/156)
* **1.37.29** upgrade to `cmake` 3.7.2
Expand Down

0 comments on commit eec3e8c

Please sign in to comment.