From 2305c0c65312b9db4835d6be453076e8facb2780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0=C3=A1cha?= Date: Mon, 1 Sep 2025 14:50:06 +0200 Subject: [PATCH 1/2] simplify setting of CPM source cache directory --- CMakeLists.txt | 8 +++---- cmake/CustomOptions.cmake | 1 - cmake/PrintSummary.cmake | 48 +++++++++++++++++++-------------------- 3 files changed, 27 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 637e0f285ec..c40216cd308 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,12 +70,10 @@ include(GNUInstallDirs) include(FetchContent) include(CMakePrintHelpers) -if(EXISTS "${QGC_CPM_SOURCE_CACHE}") - set(ENV{CPM_SOURCE_CACHE} "${QGC_CPM_SOURCE_CACHE}") -else() - set(ENV{CPM_SOURCE_CACHE} "${CMAKE_BINARY_DIR}/cpm_modules") -endif() include(CPM) +if(NOT CPM_SOURCE_CACHE) + set(CPM_SOURCE_CACHE "${CMAKE_BINARY_DIR}/cpm_modules") +endif() include(Toolchain) diff --git a/cmake/CustomOptions.cmake b/cmake/CustomOptions.cmake index 0e86a25c66c..39d3bdf4f5f 100644 --- a/cmake/CustomOptions.cmake +++ b/cmake/CustomOptions.cmake @@ -85,7 +85,6 @@ set(QGC_WINDOWS_ICON_PATH "${CMAKE_SOURCE_DIR}/deploy/windows/WindowsQGC.ico" CA set(QGC_WINDOWS_RESOURCE_FILE_PATH "${CMAKE_SOURCE_DIR}/deploy/windows/QGroundControl.rc" CACHE FILEPATH "Windows Resource File Path") # CPM -set(QGC_CPM_SOURCE_CACHE "" CACHE PATH "Directory to Download CPM Dependencies, Overrides CPM_SOURCE_CACHE Env Variable") # set(CPM_USE_NAMED_CACHE_DIRECTORIES ON CACHE BOOL "Use additional directory of package name in cache on the most nested level.") # Qt diff --git a/cmake/PrintSummary.cmake b/cmake/PrintSummary.cmake index 02d0803dfda..2508fbddacf 100644 --- a/cmake/PrintSummary.cmake +++ b/cmake/PrintSummary.cmake @@ -86,7 +86,7 @@ message(STATUS "---------------------------------------------------------------- message(STATUS "-- External Dependencies -------------------------------------------") message(STATUS "MAVLink repo URL: ${QGC_MAVLINK_GIT_REPO}") message(STATUS "MAVLink repo tag: ${QGC_MAVLINK_GIT_TAG}") -message(STATUS "CPM cache directory: ${QGC_CPM_SOURCE_CACHE}") +message(STATUS "CPM cache directory: ${CPM_SOURCE_CACHE}") message(STATUS "QML output directory: ${QT_QML_OUTPUT_DIRECTORY}") message(STATUS "------------------------------------------------------------------") @@ -94,36 +94,36 @@ message(STATUS "---------------------------------------------------------------- # Platform-specific settings # ---------------------------------------------------------------------------- if(ANDROID) - message(STATUS "-- Android ---------------------------------------------------------") - message(STATUS "Target SDK: ${QGC_QT_ANDROID_TARGET_SDK_VERSION}") - message(STATUS "Package source dir: ${QGC_ANDROID_PACKAGE_SOURCE_DIR}") - message(STATUS "APK signing: ${QT_ANDROID_SIGN_APK} / AAB signing: ${QT_ANDROID_SIGN_AAB}") - message(STATUS "Use target build dir: ${QT_USE_TARGET_ANDROID_BUILD_DIR}") - message(STATUS "NDK host system: ${ANDROID_NDK_HOST_SYSTEM_NAME}") - message(STATUS "SDK root: ${ANDROID_SDK_ROOT}") - message(STATUS "Deployment type: ${QT_ANDROID_DEPLOYMENT_TYPE}") - message(STATUS "------------------------------------------------------------------") + message(STATUS "-- Android ---------------------------------------------------------") + message(STATUS "Target SDK: ${QGC_QT_ANDROID_TARGET_SDK_VERSION}") + message(STATUS "Package source dir: ${QGC_ANDROID_PACKAGE_SOURCE_DIR}") + message(STATUS "APK signing: ${QT_ANDROID_SIGN_APK} / AAB signing: ${QT_ANDROID_SIGN_AAB}") + message(STATUS "Use target build dir: ${QT_USE_TARGET_ANDROID_BUILD_DIR}") + message(STATUS "NDK host system: ${ANDROID_NDK_HOST_SYSTEM_NAME}") + message(STATUS "SDK root: ${ANDROID_SDK_ROOT}") + message(STATUS "Deployment type: ${QT_ANDROID_DEPLOYMENT_TYPE}") + message(STATUS "------------------------------------------------------------------") endif() if(MACOS) - message(STATUS "-- macOS -----------------------------------------------------------") - message(STATUS "Bundle ID: ${QGC_MACOS_BUNDLE_ID}") - message(STATUS "Info plist path: ${QGC_MACOS_PLIST_PATH}") - message(STATUS "Icon directory: ${QGC_MACOS_ICON_PATH}") - message(STATUS "Entitlements path: ${QGC_MACOS_ENTITLEMENTS_PATH}") - message(STATUS "------------------------------------------------------------------") + message(STATUS "-- macOS -----------------------------------------------------------") + message(STATUS "Bundle ID: ${QGC_MACOS_BUNDLE_ID}") + message(STATUS "Info plist path: ${QGC_MACOS_PLIST_PATH}") + message(STATUS "Icon directory: ${QGC_MACOS_ICON_PATH}") + message(STATUS "Entitlements path: ${QGC_MACOS_ENTITLEMENTS_PATH}") + message(STATUS "------------------------------------------------------------------") endif() if(WIN32) - message(STATUS "-- Windows ---------------------------------------------------------") - message(STATUS "Install header bmp: ${QGC_WINDOWS_INSTALL_HEADER_PATH}") - message(STATUS "Icon path: ${QGC_WINDOWS_ICON_PATH}") - message(STATUS "RC resource file: ${QGC_WINDOWS_RESOURCE_FILE_PATH}") - message(STATUS "------------------------------------------------------------------") + message(STATUS "-- Windows ---------------------------------------------------------") + message(STATUS "Install header bmp: ${QGC_WINDOWS_INSTALL_HEADER_PATH}") + message(STATUS "Icon path: ${QGC_WINDOWS_ICON_PATH}") + message(STATUS "RC resource file: ${QGC_WINDOWS_RESOURCE_FILE_PATH}") + message(STATUS "------------------------------------------------------------------") endif() if(LINUX) - message(STATUS "-- Linux -----------------------------------------------------------") - message(STATUS "AppImage icon path: ${QGC_APPIMAGE_ICON_PATH}") - message(STATUS "------------------------------------------------------------------") + message(STATUS "-- Linux -----------------------------------------------------------") + message(STATUS "AppImage icon path: ${QGC_APPIMAGE_ICON_PATH}") + message(STATUS "------------------------------------------------------------------") endif() From a6c282a9fa97310efe93a43ed1de39c0619cdcc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0=C3=A1cha?= Date: Mon, 1 Sep 2025 14:58:41 +0200 Subject: [PATCH 2/2] revert formatting --- cmake/PrintSummary.cmake | 46 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/cmake/PrintSummary.cmake b/cmake/PrintSummary.cmake index 2508fbddacf..276494bd759 100644 --- a/cmake/PrintSummary.cmake +++ b/cmake/PrintSummary.cmake @@ -94,36 +94,36 @@ message(STATUS "---------------------------------------------------------------- # Platform-specific settings # ---------------------------------------------------------------------------- if(ANDROID) - message(STATUS "-- Android ---------------------------------------------------------") - message(STATUS "Target SDK: ${QGC_QT_ANDROID_TARGET_SDK_VERSION}") - message(STATUS "Package source dir: ${QGC_ANDROID_PACKAGE_SOURCE_DIR}") - message(STATUS "APK signing: ${QT_ANDROID_SIGN_APK} / AAB signing: ${QT_ANDROID_SIGN_AAB}") - message(STATUS "Use target build dir: ${QT_USE_TARGET_ANDROID_BUILD_DIR}") - message(STATUS "NDK host system: ${ANDROID_NDK_HOST_SYSTEM_NAME}") - message(STATUS "SDK root: ${ANDROID_SDK_ROOT}") - message(STATUS "Deployment type: ${QT_ANDROID_DEPLOYMENT_TYPE}") - message(STATUS "------------------------------------------------------------------") + message(STATUS "-- Android ---------------------------------------------------------") + message(STATUS "Target SDK: ${QGC_QT_ANDROID_TARGET_SDK_VERSION}") + message(STATUS "Package source dir: ${QGC_ANDROID_PACKAGE_SOURCE_DIR}") + message(STATUS "APK signing: ${QT_ANDROID_SIGN_APK} / AAB signing: ${QT_ANDROID_SIGN_AAB}") + message(STATUS "Use target build dir: ${QT_USE_TARGET_ANDROID_BUILD_DIR}") + message(STATUS "NDK host system: ${ANDROID_NDK_HOST_SYSTEM_NAME}") + message(STATUS "SDK root: ${ANDROID_SDK_ROOT}") + message(STATUS "Deployment type: ${QT_ANDROID_DEPLOYMENT_TYPE}") + message(STATUS "------------------------------------------------------------------") endif() if(MACOS) - message(STATUS "-- macOS -----------------------------------------------------------") - message(STATUS "Bundle ID: ${QGC_MACOS_BUNDLE_ID}") - message(STATUS "Info plist path: ${QGC_MACOS_PLIST_PATH}") - message(STATUS "Icon directory: ${QGC_MACOS_ICON_PATH}") - message(STATUS "Entitlements path: ${QGC_MACOS_ENTITLEMENTS_PATH}") - message(STATUS "------------------------------------------------------------------") + message(STATUS "-- macOS -----------------------------------------------------------") + message(STATUS "Bundle ID: ${QGC_MACOS_BUNDLE_ID}") + message(STATUS "Info plist path: ${QGC_MACOS_PLIST_PATH}") + message(STATUS "Icon directory: ${QGC_MACOS_ICON_PATH}") + message(STATUS "Entitlements path: ${QGC_MACOS_ENTITLEMENTS_PATH}") + message(STATUS "------------------------------------------------------------------") endif() if(WIN32) - message(STATUS "-- Windows ---------------------------------------------------------") - message(STATUS "Install header bmp: ${QGC_WINDOWS_INSTALL_HEADER_PATH}") - message(STATUS "Icon path: ${QGC_WINDOWS_ICON_PATH}") - message(STATUS "RC resource file: ${QGC_WINDOWS_RESOURCE_FILE_PATH}") - message(STATUS "------------------------------------------------------------------") + message(STATUS "-- Windows ---------------------------------------------------------") + message(STATUS "Install header bmp: ${QGC_WINDOWS_INSTALL_HEADER_PATH}") + message(STATUS "Icon path: ${QGC_WINDOWS_ICON_PATH}") + message(STATUS "RC resource file: ${QGC_WINDOWS_RESOURCE_FILE_PATH}") + message(STATUS "------------------------------------------------------------------") endif() if(LINUX) - message(STATUS "-- Linux -----------------------------------------------------------") - message(STATUS "AppImage icon path: ${QGC_APPIMAGE_ICON_PATH}") - message(STATUS "------------------------------------------------------------------") + message(STATUS "-- Linux -----------------------------------------------------------") + message(STATUS "AppImage icon path: ${QGC_APPIMAGE_ICON_PATH}") + message(STATUS "------------------------------------------------------------------") endif()