Description
This is related to cached packages. No cache or direct CMake FetchContent is probably not affected, as download is tried every time.
The cache download directory is created before the download is started.
If a download is aborted for any reason (ctrl-c, server issue etc) or the hash check fails, the job may fail (not really investigated if all occurrences are handled).
The real problem comes the next time, the download directory already exists and a new download is not attempted. You will just get a cryptic message when the directory is empty.
Some proposals. All of these assumes that a failure in the download, unpack, hash check, patching will fail a job (this is not checked really in CMake I assume).
- A complete would be to add a crc on the unpacked and patched download. This could be configured or automatic. Not an option to me, would be too slow.
- Some marker file in the download to check when dir exists (and when downloaded). A simple patch below. (Will also handle "undetected" failures.
- Some marker file created after download and install is done.
A very simple patch. Should assume CMakeLists.txt if the variable is defined but empty.
diff --git a/CMakeConfig/cpm/CPM.cmake b/CMakeConfig/cpm/CPM.cmake
index ed75dd9..353717a 100644
--- a/CMakeConfig/cpm/CPM.cmake
+++ b/CMakeConfig/cpm/CPM.cmake
@@ -769,6 +769,7 @@ function(CPMAddPackage)
BINARY_DIR "${${CPM_ARGS_NAME}_BINARY_DIR}"
)
+ CPMCheckDownloadContents(${CPM_ARGS_NAME})
else()
# Enable shallow clone when GIT_TAG is not a commit hash. Our guess may not be accurate, but
# it should guarantee no commit hash get mis-detected.
@@ -809,6 +810,8 @@ function(CPMAddPackage)
if(CPM_SOURCE_CACHE AND download_directory)
file(LOCK ${download_directory}/../cmake.lock RELEASE)
endif()
+ CPMCheckDownloadContents(${CPM_ARGS_NAME})
+
if(${populated})
cpm_add_subdirectory(
"${CPM_ARGS_NAME}"
@@ -827,6 +830,12 @@ function(CPMAddPackage)
cpm_export_variables("${CPM_ARGS_NAME}")
endfunction()
+macro(CPMCheckDownloadContents PACKAGE)
+ if(NOT $ENV{MY_CPM_CHECK_CONTENT_FILE} STREQUAL "" AND NOT EXISTS "${${PACKAGE}_SOURCE_DIR}/$ENV{MY_CPM_CHECK_CONTENT_FILE}")
+ message(FATAL_ERROR "CPM: Package ${PACKAGE} was not downloaded properly, missing: ${${PACKAGE}_SOURCE_DIR}/$ENV{MY_CPM_CHECK_CONTENT_FILE}. Delete the directory and try again.")
+ endif()
+endmacro()
+
# Fetch a previously declared package
macro(CPMGetPackage Name)
if(DEFINED "CPM_DECLARATION_${Name}")