Merge pull request #2890 from K20shores/h5_shared

Remove now unused cmake
Unidata · Mar 19, 2024 · e36b111 · e36b111
2 parents 7babdcb + c38cfc5
commit e36b111
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1541,13 +1541,8 @@ foreach(_LIB ${ALL_TLL_LIBS})
   list(APPEND LINKFLAGS "-L${_LIB_DIR}")
 endforeach()
 
-#set(NC_LIBS "-lnetcdf ${NC_LIBS}")
 if(NC_LIBS)
   string(REPLACE ";" " " NC_LIBS "${NC_LIBS}")
-  string(REPLACE "-lhdf5::hdf5-shared" "-lhdf5" NC_LIBS ${NC_LIBS})
-  string(REPLACE "-lhdf5::hdf5_hl-shared" "-lhdf5_hl" NC_LIBS ${NC_LIBS})
-  string(REPLACE "-lhdf5::hdf5-static" "-lhdf5" NC_LIBS ${NC_LIBS})
-  string(REPLACE "-lhdf5::hdf5_hl-static" "-lhdf5_hl" NC_LIBS ${NC_LIBS})
 endif()
 
 string(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}")

diff --git a/include/netcdf_meta.h.in b/include/netcdf_meta.h.in
@@ -61,7 +61,7 @@
 #define NC_DISPATCH_VERSION  @NC_DISPATCH_VERSION@ /*!< Dispatch table version. */
 #define NC_HAS_PAR_FILTERS   @NC_HAS_PAR_FILTERS@ /* Parallel I/O with filter support. */
 #define NC_HAS_LOGGING       @NC_HAS_LOGGING@ /*!< Logging support. */
-#define NC_HAS_MULTIFILTERS  @NC_HAS_MULTIFILTERS@ /*!< Nczarr support. */
+
 #define NC_HAS_QUANTIZE      @NC_HAS_QUANTIZE@ /*!< Quantization support. */
 #define NC_HAS_ZSTD          @NC_HAS_ZSTD@ /*!< Zstd support. */
 #define NC_HAS_BENCHMARKS    @NC_HAS_BENCHMARKS@ /*!< Benchmarks. */

diff --git a/nc-config.cmake.in b/nc-config.cmake.in
@@ -166,13 +166,15 @@ Available values for OPTION include:
   --has-stdfilters   lists the standard filters enabled
   --has-benchmarks   whether benchmarks enabled
 
-  --libs          library linking information for netcdf
-  --static        library linking information for statically-compiled netcdf
-  --prefix        Install prefix
-  --includedir    Include directory
-  --libdir        Library directory
-  --plugindir     Plugin directory
-  --version       Library version
+  --libs             library linking information for netcdf
+  --libs-ac-syntax   forces autotools-compatible syntax argument for libraries
+  --static           library linking information for statically-compiled netcdf
+  --prefix           Install prefix
+  --includedir       Include directory
+  --libdir           Library directory
+  --plugindir        Plugin directory
+  --version          Library version
+  --build-system     Build System
 
 EOF
 
@@ -216,6 +218,7 @@ all()
         echo "  --libdir        -> $libdir"
         echo "  --plugindir     -> $plugindir"
         echo "  --version       -> $version"
+        echo "  --build-system  -> cmake"
         echo
 }
 
@@ -251,6 +254,10 @@ while test $# -gt 0; do
     --all)
         all
         ;;
+
+    --build-system)
+        echo "cmake"
+        ;;
 
     --cc)
         echo $cc
@@ -347,7 +354,20 @@ while test $# -gt 0; do
             echo $libs
         fi
         ;;
+    --libs-ac-syntax)
+
+            libs=$(echo $libs | sed 's/hdf5::hdf5_hl/hdf5_hl/g')
+            libs=$(echo $libs | sed 's/HDF5::HDF5/hdf5/g')
 
+            if [ "x$HAS_STATIC" = "xTRUE" ]; then
+                libsprivate=$(echo $libsprivate | sed 's/hdf5::hdf5_hl/hdf5_hl/g')
+                libsprivate=$(echo $libsprivate | sed 's/HDF5::HDF5/hdf5/g')
+                echo $libs $libsprivate
+            else
+                echo $libs
+            fi
+
+        ;;
     --static)
 
         ;;

diff --git a/nc-config.in b/nc-config.in
@@ -80,6 +80,7 @@ Available values for OPTION include:
   --libdir        Library directory
   --plugindir     Plugin directory
   --version       Library version
+  --build-system  Build System
 
 EOF
 
@@ -120,6 +121,7 @@ all()
         echo "  --libdir           -> $libdir"
         echo "  --plugindir        -> $plugindir"
         echo "  --version          -> $version"
+        echo "  --build-system     -> autotools"
         echo
 }
 
@@ -156,7 +158,9 @@ while test $# -gt 0; do
     --all)
         all
         ;;
-
+    --build-system)
+        echo "autotools"
+        ;;
     --cc)
         echo $cc
         ;;