From 64f8bfb7ce753e9f179e7e096beafcd3647da545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 21 Oct 2013 01:26:15 +0200 Subject: [PATCH] Really enable BUILD_STATIC for Emscripten. Dammit. --- CMakeLists.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 549e22cb1..c1ebcd244 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,13 +75,11 @@ endif() if(CORRADE_TARGET_NACL OR CORRADE_TARGET_EMSCRIPTEN) set(TARGET_GLES 1) set(TARGET_GLES2 1) +endif() - # Newlib toolchain supports only static linking - if(CORRADE_TARGET_NACL_NEWLIB) - set(BUILD_STATIC ON) - endif() -elseif(CORRADE_TARGET_EMSCRIPTEN) - # It's meaningless to use dynamic libraries with Emscripten +# NaCl newlib toolchain supports only static linking, dynamic linking is +# meaningless on Emscripten +if(CORRADE_TARGET_NACL_NEWLIB OR CORRADE_TARGET_EMSCRIPTEN) set(BUILD_STATIC ON) endif()