From 563baced13e4961500dccd35b19e9b063c93dc9c Mon Sep 17 00:00:00 2001
From: Matthias Melcher <git@matthiasm.com>
Date: Wed, 16 Jan 2019 02:12:29 +0100
Subject: Android CMake: fix, more autogenerated files

Fixed a bug that would cause an error is Android Build was NOT
defined. Creating list of test targets automatically.
---
 CMake/Android/settings.gradle.in | 2 --
 CMake/android.cmake              | 9 +++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'CMake')

diff --git a/CMake/Android/settings.gradle.in b/CMake/Android/settings.gradle.in
index 9cdfbec62..8b1378917 100644
--- a/CMake/Android/settings.gradle.in
+++ b/CMake/Android/settings.gradle.in
@@ -1,3 +1 @@
-include ':arc'
-include ':hello'
 
diff --git a/CMake/android.cmake b/CMake/android.cmake
index 2ab4c4528..267210553 100644
--- a/CMake/android.cmake
+++ b/CMake/android.cmake
@@ -163,6 +163,15 @@ macro(CREATE_ANDROID_IDE_FOR_TEST NAME SOURCES LIBRARIES)
     @ONLY
   )
 
+  file(APPEND "${CMAKE_BINARY_DIR}/AndroidStudio/settings.gradle" "include ':${ANDROID_APP_NAME}'\n")
+
 endmacro(CREATE_ANDROID_IDE_FOR_TEST NAME SOURCES LIBRARIES)
 
 
+macro(CREATE_ANDROID_IDE_WRAPUP)
+
+  message(STATUS "Wrapping up Android IDE creation")
+
+endmacro(CREATE_ANDROID_IDE_WRAPUP)
+
+
-- 
cgit v1.2.3