summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2023-10-18 19:46:02 (GMT)
committerGitHub <noreply@github.com>2023-10-18 19:46:02 (GMT)
commit8ff48054f83d2b262c799f49b6beb6459d8a5c48 (patch)
treefb54be9daf42996bc92b92b0f9177a944413ca58
parent65e1bd8ce90d286bd4ffc1575414d775ae86a319 (diff)
downloadhdf5-8ff48054f83d2b262c799f49b6beb6459d8a5c48.zip
hdf5-8ff48054f83d2b262c799f49b6beb6459d8a5c48.tar.gz
hdf5-8ff48054f83d2b262c799f49b6beb6459d8a5c48.tar.bz2
Cache variables req FORCE to change (#3706)
* Cache variables req FORCE to change * Also plugin needs FORCE
-rw-r--r--CMakeFilters.cmake4
-rw-r--r--CMakePlugins.cmake2
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
index da8e2c7..72f7f45 100644
--- a/CMakeFilters.cmake
+++ b/CMakeFilters.cmake
@@ -36,8 +36,8 @@ include (ExternalProject)
set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO GIT TGZ)")
set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ)
if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
- set (ZLIB_USE_EXTERNAL ON CACHE BOOL "Use External Library Building for ZLIB")
- set (SZIP_USE_EXTERNAL ON CACHE BOOL "Use External Library Building for SZIP")
+ set (ZLIB_USE_EXTERNAL ON CACHE BOOL "Use External Library Building for ZLIB" FORCE)
+ set (SZIP_USE_EXTERNAL ON CACHE BOOL "Use External Library Building for SZIP" FORCE)
if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT")
set (ZLIB_URL ${ZLIB_GIT_URL} CACHE STRING "Path to zlib git repository")
set (ZLIB_BRANCH ${ZLIB_GIT_BRANCH})
diff --git a/CMakePlugins.cmake b/CMakePlugins.cmake
index bc1074f..7fd332a 100644
--- a/CMakePlugins.cmake
+++ b/CMakePlugins.cmake
@@ -26,7 +26,7 @@ include (ExternalProject)
set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO GIT TGZ)")
set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ)
if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
- set (PLUGIN_USE_EXTERNAL ON CACHE BOOL "Use External Library Building for PLUGIN")
+ set (PLUGIN_USE_EXTERNAL ON CACHE BOOL "Use External Library Building for PLUGIN" FORCE)
if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT")
set (PLUGIN_URL ${PLUGIN_GIT_URL} CACHE STRING "Path to PLUGIN git repository")
set (PLUGIN_BRANCH ${PLUGIN_GIT_BRANCH})