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