Android CMake: icons, docs, more apps

1 files changed, 17 insertions, 81 deletions

diff --git a/CMake/android.cmake b/CMake/android.cmake
index 7a8064a05..7255af3fe 100644
--- a/CMake/android.cmake
+++ b/CMake/android.cmake
@@ -17,95 +17,38 @@
 #     http://www.fltk.org/str.php
 #
 
+# all target modules will be added here later
 configure_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Android/settings.gradle.in"
   "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/settings.gradle"
   @ONLY
 )
 
+# configuration file for all modules
 configure_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Android/build.gradle.in"
   "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/build.gradle"
   @ONLY
 )
 
+# create a custom abi file for this setup
 configure_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/abi-version.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/FL/abi-version.h"
   @ONLY
 )
 
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Android/app.build.gradle.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/app/build.gradle"
-  @ONLY
-)
-
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Android/AndroidManifest.xml.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/app/src/main/AndroidManifest.xml"
-  @ONLY
-)
-
-
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Android/Roboto-Regular.ttf"
-  "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/app/src/main/assets/fonts/Roboto-Regular.ttf"
-  COPYONLY
-)
-
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Android/mdpi.ic_launcher.png"
-  "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/app/src/main/res/mipmap-mdpi/ic_launcher.png"
-  COPYONLY
-)
-
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Android/hdpi.ic_launcher.png"
-  "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/app/src/main/res/mipmap-hdpi/ic_launcher.png"
-  COPYONLY
-)
-
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Android/xhdpi.ic_launcher.png"
-  "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/app/src/main/res/mipmap-xhdpi/ic_launcher.png"
-  COPYONLY
-)
-
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Android/xxhdpi.ic_launcher.png"
-  "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/app/src/main/res/mipmap-xxhdpi/ic_launcher.png"
-  COPYONLY
-)
-
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Android/strings.xml.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/app/src/main/res/values/strings.xml"
-  @ONLY
-)
-
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Android/CMakeList.txt.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/app/src/main/cpp/CMakeLists.txt"
-  @ONLY
-)
-
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Android/HelloAndroid.cxx.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/app/src/main/cpp/HelloAndroid.cxx"
-  @ONLY
-)
-
+# TODO: where should we create config.h?
 
 macro(CREATE_ANDROID_IDE_FOR_TEST NAME SOURCES LIBRARIES)
 
-  message(STATUS "Creating Android IDE for ${NAME}")
+  # message(STATUS "Creating Android IDE for ${NAME}")
 
   set (ANDROID_APP_NAME ${NAME})
+  set (ANDROID_FLTK_DIR ${CMAKE_SOURCE_DIR})
 
   set (srcs)
   set (ANDROID_APP_SOURCES)
-  set (ANDROID_APP_COPY_SOURCES)
   set (ANDROID_FLUID_COMMANDS)
   set (flsrcs)        # fluid source files
   foreach(src ${SOURCES})
@@ -113,24 +56,23 @@ macro(CREATE_ANDROID_IDE_FOR_TEST NAME SOURCES LIBRARIES)
       list(APPEND flsrcs ${src})
       string(REGEX REPLACE "(.*).fl" \\1 basename ${src})
       string(APPEND ANDROID_FLUID_COMMANDS
-        "add_custom_command( OUTPUT \"${basename}.cxx\" \"${basename}.h\"\n"
-        "  OUTPUT \"${basename}.cxx\" \"${basename}.h\"\n"
-        "  COMMAND fluid -c \"\${CMAKE_CURRENT_SOURCE_DIR}/${src}\"\n"
-        "  DEPENDS ${src}\n"
-        "  MAIN_DEPENDENCY ${src}\n"
+        "add_custom_command(\n"
+        "  OUTPUT \"\${FLTK_DIR}/test/${basename}.cxx\" \"\${FLTK_DIR}/test/${basename}.h\"\n"
+        "  COMMAND fluid -c \"${src}\"\n"
+        "  WORKING_DIRECTORY \"\${FLTK_DIR}/test\"\n"
+        "  DEPENDS \"\${FLTK_DIR}/test/${src}\"\n"
+        "  MAIN_DEPENDENCY \"\${FLTK_DIR}/test/${src}\"\n"
         ")\n\n"
       )
+      file(TOUCH "${basename}.cxx")
+      file(TOUCH "${basename}.h")
+      file(TOUCH "${basename}.fl")
       set(src_cxx ${basename}.cxx)
     else ()
       list(APPEND srcs ${src})
       set(src_cxx ${src})
     endif ("${src}" MATCHES "\\.fl$")
-    file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/AndroidStudio/${ANDROID_APP_NAME}/src/main/cpp/")
-    # FIXME: Unix only for older version of CMake
-    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
-      "${CMAKE_CURRENT_SOURCE_DIR}/${src}"
-      "${CMAKE_BINARY_DIR}/AndroidStudio/${ANDROID_APP_NAME}/src/main/cpp/${src}")
-    string(APPEND ANDROID_APP_SOURCES "    ${src_cxx}\n")
+    string(APPEND ANDROID_APP_SOURCES "    \"\${FLTK_DIR}/test/${src_cxx}\"\n")
   endforeach(src)
 
   configure_file(
@@ -187,12 +129,6 @@ macro(CREATE_ANDROID_IDE_FOR_TEST NAME SOURCES LIBRARIES)
     @ONLY
   )
 
-  configure_file(
-    "${CMAKE_SOURCE_DIR}/CMake/Android/HelloAndroid.cxx.in"
-    "${CMAKE_BINARY_DIR}/AndroidStudio/${ANDROID_APP_NAME}/src/main/cpp/HelloAndroid.cxx"
-    @ONLY
-  )
-
   file(APPEND "${CMAKE_BINARY_DIR}/AndroidStudio/settings.gradle" "include ':${ANDROID_APP_NAME}'\n")
 
 endmacro(CREATE_ANDROID_IDE_FOR_TEST NAME SOURCES LIBRARIES)
@@ -200,7 +136,7 @@ endmacro(CREATE_ANDROID_IDE_FOR_TEST NAME SOURCES LIBRARIES)
 
 macro(CREATE_ANDROID_IDE_WRAPUP)
 
-  message(STATUS "Wrapping up Android IDE creation")
+  # message(STATUS "Wrapping up Android IDE creation")
 
 endmacro(CREATE_ANDROID_IDE_WRAPUP)