From 9e60a21244f6156a72fb17b04f77e42f98736b96 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 20 Aug 2024 08:23:40 -0600 Subject: [PATCH 1/3] Clean up some `-` vs `_` in some comments Some symbols in the comments about deprecated symbols were using `-` instead of `_` --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1622f6a686..633b59fbc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -445,14 +445,14 @@ endif() # As a long term goal, and because it is now the case that # -DNETCDF_ENABLE_NCZARR => USE_NETCDF4, so make the external options -# -DNETCDF_ENABLE-NETCDF-4 and _DNETCDF_ENABLE-NETCDF4 obsolete -# in favor of --NETCDF_ENABLE-HDF5. +# -DNETCDF_ENABLE_NETCDF_4 and _DNETCDF_ENABLE_NETCDF4 obsolete +# in favor of --NETCDF_ENABLE_HDF5. # We will do the following for one more release cycle. -# 1. Make --NETCDF_ENABLE-NETCDF-4 be an alias for --NETCDF_ENABLE-NETCDF4. -# 2. Make --NETCDF_ENABLE-NETCDF4 an alias for --NETCDF_ENABLE-HDF5. +# 1. Make -DNETCDF_ENABLE_NETCDF_4 be an alias for -DNETCDF_ENABLE_NETCDF4. +# 2. Make -DNETCDF_ENABLE_NETCDF4 an alias for -DNETCDF_ENABLE_HDF5. # 3. Internally, convert most (but not all) uses of USE_NETCDF_4 and USE_NETCDF4 to USE_HDF5. -# Collect the values of -DNETCDF_ENABLE-NETCDF-4, -DNETCDF_ENABLE-NETCDF4, and -DNETCDF_ENABLE-HDF5. +# Collect the values of -DNETCDF_ENABLE_NETCDF_4, -DNETCDF_ENABLE_NETCDF4, and -DNETCDF_ENABLE_HDF5. # Figure out which options are defined and process options if(DEFINED NETCDF_ENABLE_NETCDF_4) @@ -496,8 +496,8 @@ if(UNDEF_HDF5) set(NETCDF_ENABLE_HDF5 ON CACHE BOOL "" FORCE) endif() -# Turn off enable_netcdf4 because it will be used -# as a shorthand for ENABLE_HDF5|ENABLE_HDF4|ENABLE_NCZARR +# Turn off NETCDF_ENABLE_NETCDF4 because it will be used +# as a shorthand for NETCDF_ENABLE_HDF5|NETCDF_ENABLE_HDF4|NETCDF_ENABLE_NCZARR set(NETCDF_ENABLE_NETCDF4 OFF CACHE BOOL "" FORCE) option(NETCDF_ENABLE_DAP "Enable DAP2 and DAP4 Client." ON) option(NETCDF_ENABLE_NCZARR "Enable NCZarr Client." ON) From 78b399ba665068e293da16b28d73c22ed5a39ebe Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 20 Aug 2024 08:24:54 -0600 Subject: [PATCH 2/3] Fix the fixes... --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 633b59fbc6..9d58d61503 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -445,8 +445,8 @@ endif() # As a long term goal, and because it is now the case that # -DNETCDF_ENABLE_NCZARR => USE_NETCDF4, so make the external options -# -DNETCDF_ENABLE_NETCDF_4 and _DNETCDF_ENABLE_NETCDF4 obsolete -# in favor of --NETCDF_ENABLE_HDF5. +# -DNETCDF_ENABLE_NETCDF_4 and -DNETCDF_ENABLE_NETCDF4 obsolete +# in favor of -DNETCDF_ENABLE_HDF5. # We will do the following for one more release cycle. # 1. Make -DNETCDF_ENABLE_NETCDF_4 be an alias for -DNETCDF_ENABLE_NETCDF4. # 2. Make -DNETCDF_ENABLE_NETCDF4 an alias for -DNETCDF_ENABLE_HDF5. From acd734a9628cfbd1c4f946d2d31e8f31e87c516e Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 20 Aug 2024 08:26:47 -0600 Subject: [PATCH 3/3] I think the comments don't need the -D --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d58d61503..35f4292f23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -444,15 +444,15 @@ endif() ################################ # As a long term goal, and because it is now the case that -# -DNETCDF_ENABLE_NCZARR => USE_NETCDF4, so make the external options -# -DNETCDF_ENABLE_NETCDF_4 and -DNETCDF_ENABLE_NETCDF4 obsolete -# in favor of -DNETCDF_ENABLE_HDF5. +# NETCDF_ENABLE_NCZARR => USE_NETCDF4, so make the external options +# NETCDF_ENABLE_NETCDF_4 and NETCDF_ENABLE_NETCDF4 obsolete +# in favor of NETCDF_ENABLE_HDF5. # We will do the following for one more release cycle. -# 1. Make -DNETCDF_ENABLE_NETCDF_4 be an alias for -DNETCDF_ENABLE_NETCDF4. -# 2. Make -DNETCDF_ENABLE_NETCDF4 an alias for -DNETCDF_ENABLE_HDF5. +# 1. Make NETCDF_ENABLE_NETCDF_4 be an alias for NETCDF_ENABLE_NETCDF4. +# 2. Make NETCDF_ENABLE_NETCDF4 an alias for NETCDF_ENABLE_HDF5. # 3. Internally, convert most (but not all) uses of USE_NETCDF_4 and USE_NETCDF4 to USE_HDF5. -# Collect the values of -DNETCDF_ENABLE_NETCDF_4, -DNETCDF_ENABLE_NETCDF4, and -DNETCDF_ENABLE_HDF5. +# Collect the values of NETCDF_ENABLE_NETCDF_4, NETCDF_ENABLE_NETCDF4, and NETCDF_ENABLE_HDF5. # Figure out which options are defined and process options if(DEFINED NETCDF_ENABLE_NETCDF_4)