fixup! review comment CUSTOM_CACHE_DIR -> CUSTOM_CACHE_KEY

cpm-cmake · Apr 8, 2024 · db51694 · db51694
1 parent 6aa6888
commit db51694
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -191,7 +191,7 @@ Note that passing the variable as a configure option to CMake will always overri
 You can use `CPM_SOURCE_CACHE` on GitHub Actions workflows [cache](https://github.com/actions/cache) and combine it with ccache, to make your CI faster. See the [wiki](https://github.com/cpm-cmake/CPM.cmake/wiki/Caching-with-CPM.cmake-and-ccache-on-GitHub-Actions) for more info.
 
 The directory where the version for a project is stored is by default the hash of the arguments to `CPMAddPackage()`.
-If for instance the patch command uses external files, the directory name can be set with the argument `CUSTOM_CACHE_DIR`.
+If for instance the patch command uses external files, the directory name can be set with the argument `CUSTOM_CACHE_KEY`.
 
 ### CPM_DOWNLOAD_ALL
 

diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake
@@ -540,7 +540,7 @@ function(CPMAddPackage)
       GIT_SHALLOW
       EXCLUDE_FROM_ALL
       SOURCE_SUBDIR
-      CUSTOM_CACHE_DIR
+      CUSTOM_CACHE_KEY
   )
 
   set(multiValueArgs URL OPTIONS DOWNLOAD_COMMAND)
@@ -711,9 +711,9 @@ function(CPMAddPackage)
     string(TOLOWER ${CPM_ARGS_NAME} lower_case_name)
     set(origin_parameters ${CPM_ARGS_UNPARSED_ARGUMENTS})
     list(SORT origin_parameters)
-    if(CPM_ARGS_CUSTOM_CACHE_DIR)
+    if(CPM_ARGS_CUSTOM_CACHE_KEY)
       # Application set a custom unique directory name
-      set(download_directory ${CPM_SOURCE_CACHE}/${lower_case_name}/${CPM_ARGS_CUSTOM_CACHE_DIR})
+      set(download_directory ${CPM_SOURCE_CACHE}/${lower_case_name}/${CPM_ARGS_CUSTOM_CACHE_KEY})
     elseif(CPM_USE_NAMED_CACHE_DIRECTORIES)
       string(SHA1 origin_hash "${origin_parameters};NEW_CACHE_STRUCTURE_TAG")
       set(download_directory ${CPM_SOURCE_CACHE}/${lower_case_name}/${origin_hash}/${CPM_ARGS_NAME})

diff --git a/test/unit/cache.cmake b/test/unit/cache.cmake
@@ -140,7 +140,7 @@ assert_not_exists("${CPM_SOURCE_CACHE_DIR}/fibonacci")
 
 # Use custom cache directory
 
-set(FIBONACCI_PACKAGE_ARGS "CUSTOM_CACHE_DIR my_custom_unique_dir GIT_TAG e9ebf168ca0fffaa4ef8c6fefc6346aaa22f6ed5")
+set(FIBONACCI_PACKAGE_ARGS "CUSTOM_CACHE_KEY my_custom_unique_dir GIT_TAG e9ebf168ca0fffaa4ef8c6fefc6346aaa22f6ed5")
 set(FIBONACCI_VERSION 1.1)
 update_cmake_lists()