diff options
| author | Matthias Melcher <git@matthiasm.com> | 2019-01-16 02:12:29 +0100 |
|---|---|---|
| committer | Matthias Melcher <git@matthiasm.com> | 2019-01-16 02:12:29 +0100 |
| commit | 563baced13e4961500dccd35b19e9b063c93dc9c (patch) | |
| tree | 1ffaea2a4963c0a7f652a9b87be7d84f3453a7c5 | |
| parent | 6de1c93e545e8100a4e907938dccd9b0564e12a2 (diff) | |
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.
| -rw-r--r-- | CMake/Android/settings.gradle.in | 2 | ||||
| -rw-r--r-- | CMake/android.cmake | 9 | ||||
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 10 |
4 files changed, 24 insertions, 4 deletions
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) + + diff --git a/CMakeLists.txt b/CMakeLists.txt index dd67da35e..e5a1e7fa1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,6 +104,13 @@ if(OPTION_BUILD_EXAMPLES) endif(OPTION_BUILD_EXAMPLES) ####################################################################### +# Android Studio wrapup +####################################################################### +if (OPTION_CREATE_ANDROID_STUDIO_IDE) + CREATE_ANDROID_IDE_WRAPUP() +endif (OPTION_CREATE_ANDROID_STUDIO_IDE) + +####################################################################### # installation ####################################################################### include(CMake/install.cmake) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 64bed5ca3..409f44e71 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -39,11 +39,17 @@ include_directories( ) ####################################################################### +## testing creation of Android Studio IDE files +if (OPTION_CREATE_ANDROID_STUDIO_IDE) +CREATE_ANDROID_IDE_FOR_TEST(arc arc.cxx fltk) +CREATE_ANDROID_IDE_FOR_TEST(hello hello.cxx fltk) +CREATE_ANDROID_IDE_FOR_TEST(input input.cxx fltk) +endif (OPTION_CREATE_ANDROID_STUDIO_IDE) + +####################################################################### if(NOT ANDROID) CREATE_EXAMPLE(adjuster adjuster.cxx fltk) CREATE_EXAMPLE(arc arc.cxx fltk) -CREATE_ANDROID_IDE_FOR_TEST(arc arc.cxx fltk) -CREATE_ANDROID_IDE_FOR_TEST(hello hello.cxx fltk) CREATE_EXAMPLE(animated animated.cxx fltk) CREATE_EXAMPLE(ask ask.cxx fltk) CREATE_EXAMPLE(bitmap bitmap.cxx fltk) |