From 8eb755794457ef42982998b8c1fd0248ec4577ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 9 Jan 2021 21:45:12 +0100 Subject: [PATCH] We don't need the UseEmscripten module for anything. --- CMakeLists.txt | 4 ---- doc/changelog.dox | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0913b722f..6b6a636e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -291,10 +291,6 @@ if(TARGET_VK) set(MAGNUM_TARGET_VK 1) endif() -if(CORRADE_TARGET_EMSCRIPTEN) - include(UseEmscripten) -endif() - if(WITH_OPENGLTESTER) if(MAGNUM_TARGET_HEADLESS OR CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID) set(WITH_WINDOWLESSEGLAPPLICATION ON) diff --git a/doc/changelog.dox b/doc/changelog.dox index 8e2ed4bf6..d17d296b2 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -246,6 +246,8 @@ See also: - Switched Emscripten build from macOS to Ubuntu + Docker for 2x faster build times (see [mosra/magnum#350](https://github.com/mosra/magnum/issues/350)) - Linux, Emscripten and macOS builds were migrated from Travis to Circle CI +- `UseEmscripten` is no longer implicitly included on Emscripten as it's not + needed for anything (see [mosra/magnum#490](https://github.com/mosra/magnum/issues/490)) - @ref Trade::ObjImporter "ObjImporter" uses exceptions internally and needs an explicit exception-enabling flag when built with Emscripten 1.39.0 and newer