Avoid using too many cmake variables

Author: kunitoki

cmake/yup.cmake

@@ -846,7 +846,7 @@ function (yup_standalone_app)
     _yup_make_short_version ("${target_version}" target_version_short)
 
     # ==== Setup Android platform, build gradle stage
-    if (YUP_TARGET_ANDROID AND YUP_TARGET_ANDROID_BUILD_GRADLE)
+    if (YUP_TARGET_ANDROID)
         _yup_prepare_gradle_android(
             TARGET_NAME ${target_name}
             APPLICATION_ID ${target_app_id}

examples/app/CMakeLists.txt

@@ -24,7 +24,7 @@ set (target_name example_app)
 set (target_version "1.0.0")
 
 # ==== Prepare Android build
-if (ANDROID AND NOT YUP_TARGET_ANDROID_BUILD_GRADLE)
+if (ANDROID)
     # project (${target_name} VERSION ${target_version})
     include (../../cmake/yup.cmake)
     _yup_setup_platform()
@@ -53,7 +53,7 @@ yup_standalone_app (
 )
 
 # ==== Prepare sources
-if (NOT YUP_TARGET_ANDROID_BUILD_GRADLE)
+if (NOT YUP_TARGET_ANDROID)
     file (GLOB_RECURSE sources "${CMAKE_CURRENT_LIST_DIR}/source/*.cpp")
     source_group (TREE ${CMAKE_CURRENT_LIST_DIR}/ FILES ${sources})
     target_sources (${target_name} PRIVATE ${sources})

examples/console/CMakeLists.txt

@@ -24,7 +24,7 @@ set (target_name example_console)
 set (target_version "1.0.0")
 
 # ==== Prepare Android build
-if (ANDROID AND NOT YUP_TARGET_ANDROID_BUILD_GRADLE)
+if (ANDROID)
     # project (${target_name} VERSION ${target_version})
     include (../../cmake/yup.cmake)
     _yup_setup_platform()
@@ -47,7 +47,7 @@ yup_standalone_app (
 )
 
 # ==== Prepare sources
-if (NOT YUP_TARGET_ANDROID_BUILD_GRADLE)
+if (NOT YUP_TARGET_ANDROID)
     file (GLOB_RECURSE sources "${CMAKE_CURRENT_LIST_DIR}/source/*.cpp")
     source_group (TREE ${CMAKE_CURRENT_LIST_DIR}/ FILES ${sources})
     target_sources (${target_name} PRIVATE ${sources})

examples/graphics/CMakeLists.txt

@@ -24,7 +24,7 @@ set (target_name example_graphics)
 set (target_version "1.0.0")
 
 # ==== Prepare Android build
-if (ANDROID AND NOT YUP_TARGET_ANDROID_BUILD_GRADLE)
+if (ANDROID)
     # project (${target_name} VERSION ${target_version})
     include (../../cmake/yup.cmake)
     _yup_setup_platform()
@@ -66,7 +66,7 @@ yup_standalone_app (
 )
 
 # ==== Prepare sources
-if (NOT YUP_TARGET_ANDROID_BUILD_GRADLE)
+if (NOT YUP_TARGET_ANDROID)
     file (GLOB_RECURSE sources "${CMAKE_CURRENT_LIST_DIR}/source/*.cpp")
     source_group (TREE ${CMAKE_CURRENT_LIST_DIR}/ FILES ${sources})
     target_sources (${target_name} PRIVATE ${sources})

examples/render/CMakeLists.txt

@@ -24,13 +24,13 @@ set (target_name example_render)
 set (target_version "1.0.0")
 
 set (link_options "")
-if ("${yup_platform}" MATCHES "^(emscripten)$")
+if (EMSCRIPTEN)
     set (link_options --preload-file ${CMAKE_CURRENT_LIST_DIR}/data/alien.riv@data/alien.riv)
 endif()
 
 # ==== Prepare Android build
 set (link_libraries "")
-if (ANDROID AND NOT YUP_TARGET_ANDROID_BUILD_GRADLE)
+if (ANDROID)
     # project (${target_name} VERSION ${target_version})
     include (../../cmake/yup.cmake)
     _yup_setup_platform()
@@ -73,7 +73,7 @@ yup_standalone_app (
 )
 
 # ==== Prepare sources
-if (NOT YUP_TARGET_ANDROID_BUILD_GRADLE)
+if (NOT YUP_TARGET_ANDROID)
     file (GLOB_RECURSE sources "${CMAKE_CURRENT_LIST_DIR}/source/*.cpp")
     source_group (TREE ${CMAKE_CURRENT_LIST_DIR}/ FILES ${sources})
     target_sources (${target_name} PRIVATE ${sources})

justfile

@@ -33,7 +33,7 @@ emscripten:
   python3 -m http.server -d build/examples/render/Debug
 
 android:
-  cmake -G "Unix Makefiles" -B build -DYUP_TARGET_ANDROID=ON -DYUP_TARGET_ANDROID_BUILD_GRADLE=ON
+  cmake -G "Unix Makefiles" -B build -DYUP_TARGET_ANDROID=ON
 
 #run:
 #  @just make