Don't warn about dirty source trees when a PATCH_COMMAND is provided (#401 )

The patch command will always cause a dirty source tree, which is expected and not a cause for concern.
Expand absolute path later in get_cpm.cmake (#397 )
2025-11-23 20:57:38 -05:00 · 2022-09-13 23:21:12 +02:00 · 2022-09-13 20:54:57 +00:00 · 2022-09-13 22:44:24 +02:00
2 changed files with 6 additions and 3 deletions
--- a/cmake/CPM.cmake
+++ b/cmake/CPM.cmake
@@ -235,6 +235,9 @@ function(cpm_find_package NAME VERSION)
  string(REPLACE " " ";" EXTRA_ARGS "${ARGN}")
  find_package(${NAME} ${VERSION} ${EXTRA_ARGS} QUIET)
  if(${CPM_ARGS_NAME}_FOUND)
+    if(DEFINED ${CPM_ARGS_NAME}_VERSION)
+      set(VERSION ${${CPM_ARGS_NAME}_VERSION})
+    endif()
    message(STATUS "${CPM_INDENT} using local package ${CPM_ARGS_NAME}@${VERSION}")
    CPMRegisterPackage(${CPM_ARGS_NAME} "${VERSION}")
    set(CPM_PACKAGE_FOUND
@@ -709,7 +712,7 @@ function(CPMAddPackage)
      )
      cpm_get_fetch_properties("${CPM_ARGS_NAME}")

-      if(DEFINED CPM_ARGS_GIT_TAG)
+      if(DEFINED CPM_ARGS_GIT_TAG AND NOT (PATCH_COMMAND IN_LIST CPM_ARGS_UNPARSED_ARGUMENTS))
        # warn if cache has been changed since checkout
        cpm_check_git_working_dir_is_clean(${download_directory} ${CPM_ARGS_GIT_TAG} IS_CLEAN)
        if(NOT ${IS_CLEAN})
--- a/cmake/get_cpm.cmake
+++ b/cmake/get_cpm.cmake
@@ -1,8 +1,6 @@
 set(CPM_DOWNLOAD_VERSION 1.0.0-development-version)

 if(CPM_SOURCE_CACHE)
-  # Expand relative path. This is important if the provided path contains a tilde (~)
-  get_filename_component(CPM_SOURCE_CACHE ${CPM_SOURCE_CACHE} ABSOLUTE)
  set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
 elseif(DEFINED ENV{CPM_SOURCE_CACHE})
  set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
@@ -10,6 +8,8 @@ else()
  set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
 endif()

+# Expand relative path. This is important if the provided path contains a tilde (~)
+get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE)
 if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))
  message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}")
  file(DOWNLOAD
Author	SHA1	Message	Date
Robert Maynard	63d0de7114	Don't warn about dirty source trees when a PATCH_COMMAND is provided (#401 ) The patch command will always cause a dirty source tree, which is expected and not a cause for concern.	2022-09-13 23:21:12 +02:00
Kamil Kisiel	65c760a840	Expand absolute path later in get_cpm.cmake (#397 ) * Expand absolute path later in get_cpm.cmake Supports expanding tildes in the environment. * Apply cmake-format to get_cpm.cmake * Use .cmake-format file	2022-09-13 20:54:57 +00:00
Robert Maynard	b5e60e72e8	cpm_find_package Use found package version when possible (#396 )	2022-09-13 22:44:24 +02:00