From b72060d9a28c5c6cab0600693035dee509115744 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Thu, 11 Aug 2016 11:51:42 -0400 Subject: [PATCH] browser-asmjs: Remove CMakeForceCompiler CMakeForceCompiler was marked deprecated in CMake 3.6.0. It emits many warnings when using Emscripten. These changes can be removed in a future version of Emscripten when it is disabled or removed per: https://github.com/kripken/emscripten/pull/4477 --- browser-asmjs/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/browser-asmjs/Dockerfile b/browser-asmjs/Dockerfile index 39e28ad..6e68b0f 100644 --- a/browser-asmjs/Dockerfile +++ b/browser-asmjs/Dockerfile @@ -43,3 +43,9 @@ RUN cd /tmp && \ ENV DEFAULT_DOCKCROSS_IMAGE dockcross/browser-asmjs ENV CMAKE_TOOLCHAIN_FILE /usr/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/cmake/Modules/Platform/Emscripten.cmake +# CMakeForceCompiler was marked deprecated in CMake 3.6.0. It emits many +# warnings when using Emscripten. These changes can be removed in a future +# version of Emscripten when it is disabled or removed per: +# https://github.com/kripken/emscripten/pull/4477 +RUN sed -i -e '/CMakeForceCompiler/d' -e '/CMAKE_FORCE_C/d' $CMAKE_TOOLCHAIN_FILE +