test2

DennisHeimbigner · Sep 24, 2024 · 039ffe1 · 039ffe1
1 parent f24bc7a
commit 039ffe1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -41,11 +41,11 @@ IF(NETCDF_ENABLE_PNETCDF OR NETCDF_ENABLE_PARALLEL4)
     COMPONENT headers)
 ENDIF()
 
-INSTALL(FILES ${netCDF_SOURCE_DIR}/include/netcdf_json.h
+INSTALL(FILES ${netCDF_BINARY_DIR}/include/netcdf_json.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     COMPONENT headers)
 
-INSTALL(FILES ${netCDF_SOURCE_DIR}/include/netcdf_proplist.h
+INSTALL(FILES ${netCDF_BINARY_DIR}/include/netcdf_proplist.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     COMPONENT headers)
 

diff --git a/libdispatch/dplugins.c b/libdispatch/dplugins.c
@@ -42,14 +42,6 @@ Unified plugin related code
 /* Control path verification */
 #define PLUGINPATHVERIFY "NC_PLUGIN_PATH_VERIFY"
 
-/* Initializers/Finalizers for the implementations */
-#ifdef NETCDF_ENABLE_HDF5
-extern int NC4_hdf5_plugin_path_finalize(void);
-#endif
-#ifdef NETCDF_ENABLE_NCZARR
-extern int NCZ__plugin_path_finalize(void);
-#endif
-
 static int NC_plugin_path_initialized = 0;
 static int NC_plugin_path_verify = 1;
 

diff --git a/libhdf5/hdf5internal.c b/libhdf5/hdf5internal.c
@@ -15,6 +15,7 @@
  */
 
 #include "config.h"
+#include "ncplugins.h"
 #include "hdf5internal.h"
 #include "hdf5err.h" /* For BAIL2 */
 #include <stddef.h>
@@ -97,7 +98,6 @@ nc4_hdf5_finalize(void)
     /* Reclaim global resources */
     NC4_provenance_finalize();
     NC4_hdf5_filter_finalize();
-    NC4_hdf5_plugin_path_finalize();
     nc4_hdf5_initialized = 0;
 }