From 8e0004afea39bd3e5a8649da00c3a9cc9a72ea4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 19 Nov 2018 15:50:29 +0100 Subject: [PATCH] Include UseAndroid only for tests. Because we need it only for tests. --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0de6cab66..87c556e40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,14 +61,6 @@ find_package(Corrade REQUIRED Utility) include(CMakeDependentOption) -# For experimental Gradle-less Android APK creation. Only with CMake > 3.7 that -# has builtin Android support -- Gradle uses 3.6 so this will nicely work in -# both cases. -if(CORRADE_TARGET_ANDROID AND CMAKE_ANDROID_NDK) - list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/toolchains/modules/") - include(UseAndroid) -endif() - # If targeting iOS, Android, Emscripten or Windows RT, set explicit OpenGL ES # support if(NOT CORRADE_TARGET_IOS AND NOT CORRADE_TARGET_ANDROID AND NOT CORRADE_TARGET_EMSCRIPTEN AND NOT CORRADE_TARGET_WINDOWS_RT) @@ -202,6 +194,14 @@ if(BUILD_TESTS) set(CORRADE_TESTSUITE_BUNDLE_IDENTIFIER_PREFIX "cz.mosra.magnum") endif() enable_testing() + + # For experimental Gradle-less Android APK creation. Only with CMake > 3.7 + # that has builtin Android support -- Gradle uses 3.6 so this will nicely + # work in both cases. + if(CORRADE_TARGET_ANDROID AND CMAKE_ANDROID_NDK) + list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/toolchains/modules/") + include(UseAndroid) + endif() endif() # OpenGLTester library, built by default only if GL tests are enabled