Custom Build: Android overrides for min/target sdk (#12148)

* Reorganize into general and targeted sections * Add support for override of android min/target sdk versions --------- Co-authored-by: Holden <[email protected]>
mavlink · Nov 29, 2024 · fd1ecc9 · fd1ecc9
1 parent 1de8d27
commit fd1ecc9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -445,8 +445,8 @@ elseif(ANDROID)
     set_target_properties(${PROJECT_NAME}
         PROPERTIES
             # QT_ANDROID_ABIS ${ANDROID_ABI}
-            QT_ANDROID_MIN_SDK_VERSION 25
-            QT_ANDROID_TARGET_SDK_VERSION 35
+            QT_ANDROID_MIN_SDK_VERSION ${QGC_QT_ANDROID_MIN_SDK_VERSION}
+            QT_ANDROID_TARGET_SDK_VERSION ${QGC_QT_ANDROID_TARGET_SDK_VERSION}
             QT_ANDROID_PACKAGE_SOURCE_DIR "${QGC_ANDROID_PACKAGE_SOURCE_DIR}"
             QT_ANDROID_VERSION_NAME ${CMAKE_PROJECT_VERSION}
             QT_ANDROID_VERSION_CODE ${ANDROID_VERSION_CODE}

diff --git a/cmake/CustomOptions.cmake b/cmake/CustomOptions.cmake
@@ -1,4 +1,7 @@
 # The following options can be overriden by custom builds using the CustomOverrides.cmake file
+
+# General
+
 set(QGC_APP_NAME "QGroundControl" CACHE STRING "App Name")
 set(QGC_APP_COPYRIGHT "Copyright (c) 2024 QGroundControl. All rights reserved." CACHE STRING "Copyright")
 set(QGC_APP_DESCRIPTION "Open Source Ground Control App" CACHE STRING "Description")
@@ -7,19 +10,6 @@ set(QGC_ORG_DOMAIN "org.qgroundcontrol" CACHE STRING "Domain")
 
 option(QGC_STABLE_BUILD "Stable Build" OFF)
 
-# MacOS
-set(QGC_BUNDLE_ID "org.qgroundcontrol.QGroundControl" CACHE STRING "MacOS Bundle ID") # MACOS
-set(QGC_MACOS_ICON_PATH "${CMAKE_SOURCE_DIR}/deploy/mac" CACHE PATH "MacOS Icon Path") # MACOS
-
-# APM
-option(QGC_DISABLE_APM_MAVLINK "Disable APM Dialect" OFF)
-option(QGC_DISABLE_APM_PLUGIN "Disable APM Plugin" OFF)
-option(QGC_DISABLE_APM_PLUGIN_FACTORY "Disable APM Plugin Factory" OFF)
-
-# PX4
-option(QGC_DISABLE_PX4_PLUGIN "Disable PX4 Plugin" OFF)
-option(QGC_DISABLE_PX4_PLUGIN_FACTORY "Disable PX4 Plugin Factory" OFF)
-
 option(QGC_ENABLE_BLUETOOTH "Enable Bluetooth Links" ON) # Qt6Bluetooth_FOUND
 option(QGC_ZEROCONF_ENABLED "Enable ZeroConf Compatibility" OFF)
 option(QGC_AIRLINK_DISABLED "Disable AIRLink" ON)
@@ -34,3 +24,20 @@ option(QGC_ENABLE_QT_VIDEOSTREAMING "Enable QtMultimedia Video Backend" OFF) # Q
 
 set(QGC_MAVLINK_GIT_REPO "https://github.com/mavlink/c_library_v2.git" CACHE STRING "URL to MAVLink Git Repo")
 set(QGC_MAVLINK_GIT_TAG "4db2f67156d996eae90ef437a73353468d850407" CACHE STRING "Tag of MAVLink Git Repo")
+
+set(QGC_QT_ANDROID_MIN_SDK_VERSION "26" CACHE STRING "Android Min SDK Version")
+set(QGC_QT_ANDROID_TARGET_SDK_VERSION "35" CACHE STRING "Android Target SDK Version")
+
+# MacOS
+set(QGC_BUNDLE_ID "org.qgroundcontrol.QGroundControl" CACHE STRING "MacOS Bundle ID") # MACOS
+set(QGC_MACOS_ICON_PATH "${CMAKE_SOURCE_DIR}/deploy/mac" CACHE PATH "MacOS Icon Path") # MACOS
+
+# APM
+option(QGC_DISABLE_APM_MAVLINK "Disable APM Dialect" OFF)
+option(QGC_DISABLE_APM_PLUGIN "Disable APM Plugin" OFF)
+option(QGC_DISABLE_APM_PLUGIN_FACTORY "Disable APM Plugin Factory" OFF)
+
+# PX4
+option(QGC_DISABLE_PX4_PLUGIN "Disable PX4 Plugin" OFF)
+option(QGC_DISABLE_PX4_PLUGIN_FACTORY "Disable PX4 Plugin Factory" OFF)
+