Skip to content

Simplify usage of CPM_SOURCE_CACHE #13344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2025
+4 −7
Merged

Simplify usage of CPM_SOURCE_CACHE #13344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2305c0c
simplify setting of CPM source cache directory
lyorig Sep 1, 2025
a6c282a
revert formatting
lyorig Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
1 change: 0 additions & 1 deletion cmake/CustomOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/PrintSummary.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "------------------------------------------------------------------")

Expand Down
Loading