CMake: Custom Build Fixes

mavlink · Aug 23, 2024 · 5e82cdb · 5e82cdb
1 parent e9b615f
commit 5e82cdb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/cmake/CustomOptions.cmake b/cmake/CustomOptions.cmake
@@ -1,13 +1,13 @@
 # The following options can be overriden by custom builds using the CustomOverrides.cmake file
-set(QGC_APP_NAME "QGroundControl")
-set(QGC_APP_COPYRIGHT "Copyright (c) 2024 QGroundControl. All rights reserved.")
-set(QGC_APP_DESCRIPTION "Open Source Ground Control App")
-set(QGC_ORG_NAME "QGroundControl.org")
-set(QGC_ORG_DOMAIN "org.qgroundcontrol")
+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")
+set(QGC_ORG_NAME "QGroundControl.org" CACHE STRING "Org Name")
+set(QGC_ORG_DOMAIN "org.qgroundcontrol" CACHE STRING "Domain")
 
 # MacOS
-set(QGC_BUNDLE_ID "org.qgroundcontrol.QGroundControl")
-set(QGC_MACOS_ICON_PATH "${CMAKE_SOURCE_DIR}/resources/icons")
+set(QGC_BUNDLE_ID "org.qgroundcontrol.QGroundControl" CACHE STRING "MacOS Bundle ID")
+set(QGC_MACOS_ICON_PATH "${CMAKE_SOURCE_DIR}/resources/icons" CACHE PATH "MacOS Icon Path")
 
 # APM
 option(QGC_DISABLE_APM_MAVLINK "Disable APM Dialect" OFF)

diff --git a/custom-example/CMakeLists.txt b/custom-example/CMakeLists.txt
@@ -9,18 +9,18 @@ set_property(DIRECTORY ${CMAKE_SOURCE_DIR}
     CUSTOMCLASS=CustomPlugin
 )
 
-find_package(Python)
-if(PYTHON_FOUND)
+find_package(Python3)
+if(Python3_FOUND)
     execute_process(
-        COMMAND ${PYTHON_EXECUTABLE}
+        COMMAND ${Python3_EXECUTABLE}
         RESULT_VARIABLE PYTHON_RESULT
         OUTPUT_VARIABLE PYTHON_OUTPUT
         ERROR_VARIABLE PYTHON_ERROR
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         INPUT_FILE updateqrc.py
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-    cmake_print_variables(RESULT_VARIABLE OUTPUT_VARIABLE ERROR_VARIABLE)
+    cmake_print_variables(PYTHON_RESULT PYTHON_OUTPUT PYTHON_ERROR)
 endif()
 
 # Our own, custom resources

diff --git a/custom-example/cmake/CustomOverrides.cmake b/custom-example/cmake/CustomOverrides.cmake
@@ -1,6 +1,6 @@
-set(QGC_APP_NAME "Custom-QGroundControl")
+set(QGC_APP_NAME "Custom-QGroundControl" CACHE STRING "App Name" FORCE)
 
-set(QGC_MACOS_ICON_PATH "${CMAKE_SOURCE_DIR}/custom/res")
+set(QGC_MACOS_ICON_PATH "${CMAKE_SOURCE_DIR}/custom/res" CACHE PATH "MacOS Icon Path" FORCE)
 
 # Build a single flight stack by disabling APM support
 set(QGC_DISABLE_APM_MAVLINK ON CACHE BOOL "Disable APM Dialect" FORCE)

diff --git a/src/AutoPilotPlugins/APM/CMakeLists.txt b/src/AutoPilotPlugins/APM/CMakeLists.txt
@@ -46,7 +46,6 @@ qt_add_library(APMAutoPilotPlugin STATIC
 target_link_libraries(APMAutoPilotPlugin
     PRIVATE
         APMFirmwarePlugin
-        AutoPilotPlugins
         FactSystem
         QGC
         Settings
@@ -56,6 +55,7 @@ target_link_libraries(APMAutoPilotPlugin
     PUBLIC
         Qt6::Core
         Qt6::Quick
+        AutoPilotPlugins
         CommonAutoPilotPlugin
         FactControls
         MAVLink

diff --git a/src/FirmwarePlugin/CMakeLists.txt b/src/FirmwarePlugin/CMakeLists.txt
@@ -1,7 +1,9 @@
 if(NOT QGC_DISABLE_APM_PLUGIN)
     add_subdirectory(APM)
 endif()
-add_subdirectory(PX4)
+if(NOT QGC_DISABLE_PX4_PLUGIN)
+    add_subdirectory(PX4)
+endif()
 
 find_package(Qt6 REQUIRED COMPONENTS Core Positioning)