mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-27 07:30:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2856 from gsjaardema/patch-58

Browse Source 
Minor -- fix UNset to unset
This commit is contained in:
Ward Fisher 2024-02-01 12:57:06 -08:00 committed by GitHub
commit 68516c82b4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -568,7 +568,7 @@ if(DEFINED PLUGIN_INSTALL_DIR)
if(boolval) if(boolval)
set(ENABLE_PLUGIN_INSTALL YES) set(ENABLE_PLUGIN_INSTALL YES)
# No actual value was specified # No actual value was specified
UNset(PLUGIN_INSTALL_DIR CACHE) unset(PLUGIN_INSTALL_DIR CACHE)
else() else()
if(boolval STREQUAL "NOTFOUND") if(boolval STREQUAL "NOTFOUND")
# Must be an actual value # Must be an actual value
@ -583,7 +583,7 @@ endif()
# Ensure no defined plugin dir if not enabled # Ensure no defined plugin dir if not enabled
if(NOT ENABLE_PLUGIN_INSTALL) if(NOT ENABLE_PLUGIN_INSTALL)
UNset(PLUGIN_INSTALL_DIR CACHE) unset(PLUGIN_INSTALL_DIR CACHE)
endif() endif()
if(ENABLE_PLUGIN_INSTALL) if(ENABLE_PLUGIN_INSTALL)
@ -615,8 +615,8 @@ if(ENABLE_PLUGIN_INSTALL)
set(PLUGIN_INSTALL_DIR_SETTING "${PLUGIN_INSTALL_DIR}") set(PLUGIN_INSTALL_DIR_SETTING "${PLUGIN_INSTALL_DIR}")
message("Final value of-DPLUGIN_INSTALL_DIR=${PLUGIN_INSTALL_DIR}") message("Final value of-DPLUGIN_INSTALL_DIR=${PLUGIN_INSTALL_DIR}")
else() # No option specified else() # No option specified
UNset(PLUGIN_INSTALL_DIR) unset(PLUGIN_INSTALL_DIR)
UNset(PLUGIN_INSTALL_DIR CACHE) unset(PLUGIN_INSTALL_DIR CACHE)
set(PLUGIN_INSTALL_DIR_SETTING "N.A.") set(PLUGIN_INSTALL_DIR_SETTING "N.A.")
endif() endif()
@ -696,7 +696,7 @@ endif()
if (NOT ENABLE_S3 AND ENABLE_NCZARR_S3) if (NOT ENABLE_S3 AND ENABLE_NCZARR_S3)
set(ENABLE_S3 ON CACHE BOOL "NCARR S3" FORCE) # For back compatibility set(ENABLE_S3 ON CACHE BOOL "NCARR S3" FORCE) # For back compatibility
endif() endif()
UNset(ENABLE_NCZARR_S3) unset(ENABLE_NCZARR_S3)
if(NOT ENABLE_REMOTE_FUNCTIONALITY) if(NOT ENABLE_REMOTE_FUNCTIONALITY)
message(WARNING "ENABLE_REMOTE_FUNCTIONALITY=NO => disable all s3 functionality") message(WARNING "ENABLE_REMOTE_FUNCTIONALITY=NO => disable all s3 functionality")