From a46990989a7406f021cc02bed6979951dfda35b4 Mon Sep 17 00:00:00 2001 From: blozano-tt Date: Thu, 19 Jun 2025 19:15:51 +0000 Subject: [PATCH 1/3] Allow users to override the default path for CPM_SOURCE_CACHE using Cmake variable --- cmake/CPM.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake index 2d151bf9..30d3d3b5 100644 --- a/cmake/CPM.cmake +++ b/cmake/CPM.cmake @@ -155,7 +155,7 @@ set(CPM_DRY_RUN CACHE INTERNAL "Don't download or configure dependencies (for testing)" ) -if(DEFINED ENV{CPM_SOURCE_CACHE}) +if(DEFINED ENV{CPM_SOURCE_CACHE} AND NOT DEFINED CPM_SOURCE_CACHE_DEFAULT) set(CPM_SOURCE_CACHE_DEFAULT $ENV{CPM_SOURCE_CACHE}) else() set(CPM_SOURCE_CACHE_DEFAULT OFF) From 00424300a27968fecbcc678ceb588d6ca53db9db Mon Sep 17 00:00:00 2001 From: Bryan Wilder Field Lozano Date: Thu, 19 Jun 2025 12:26:45 -0700 Subject: [PATCH 2/3] Update CPM.cmake --- cmake/CPM.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake index 30d3d3b5..87db1b0d 100644 --- a/cmake/CPM.cmake +++ b/cmake/CPM.cmake @@ -157,7 +157,7 @@ set(CPM_DRY_RUN if(DEFINED ENV{CPM_SOURCE_CACHE} AND NOT DEFINED CPM_SOURCE_CACHE_DEFAULT) set(CPM_SOURCE_CACHE_DEFAULT $ENV{CPM_SOURCE_CACHE}) -else() +elseif(NOT DEFINED CPM_SOURCE_CACHE_DEFAULT) set(CPM_SOURCE_CACHE_DEFAULT OFF) endif() From 91662ef1887f950acd2740f56e5385a1a73b43ac Mon Sep 17 00:00:00 2001 From: Bryan Wilder Field Lozano Date: Thu, 19 Jun 2025 20:57:21 -0700 Subject: [PATCH 3/3] Update CPM.cmake --- cmake/CPM.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake index 87db1b0d..5d45c155 100644 --- a/cmake/CPM.cmake +++ b/cmake/CPM.cmake @@ -155,7 +155,10 @@ set(CPM_DRY_RUN CACHE INTERNAL "Don't download or configure dependencies (for testing)" ) -if(DEFINED ENV{CPM_SOURCE_CACHE} AND NOT DEFINED CPM_SOURCE_CACHE_DEFAULT) +# ENV gets top priority to control CPM_SOURCE_CACHE location +# If it is not defined, allow user to control the location with CPM_SOURCE_CACHE_DEFAULT +# If neither are set disable CPM_SOURCE_CACHE +if(DEFINED ENV{CPM_SOURCE_CACHE}) set(CPM_SOURCE_CACHE_DEFAULT $ENV{CPM_SOURCE_CACHE}) elseif(NOT DEFINED CPM_SOURCE_CACHE_DEFAULT) set(CPM_SOURCE_CACHE_DEFAULT OFF)