From 2900df4493ca6b813756b1facf87fb6550e8beb5 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Fri, 24 May 2024 10:42:46 -0700 Subject: [PATCH] Move/rename libhdf5.settings input files Move without other changes: src/libhdf5.settings.in -> src/libhdf5.settings.autotools.in config/cmake/libhdf5.settings.cmake.in -> src/libhdf5.settings.cmake.in --- CMakeInstallation.cmake | 2 +- configure.ac | 2 +- src/{libhdf5.settings.in => libhdf5.settings.autotools.in} | 0 {config/cmake => src}/libhdf5.settings.cmake.in | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename src/{libhdf5.settings.in => libhdf5.settings.autotools.in} (100%) rename {config/cmake => src}/libhdf5.settings.cmake.in (100%) diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 10e4036ca34..2188e36316c 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -120,7 +120,7 @@ else () set (BYTESEX little-endian) endif () configure_file ( - ${HDF_RESOURCES_DIR}/libhdf5.settings.cmake.in + ${HDF5_SOURCE_DIR}/src/libhdf5.settings.cmake.in ${HDF5_SRC_BINARY_DIR}/libhdf5.settings ESCAPE_QUOTES @ONLY ) install ( diff --git a/configure.ac b/configure.ac index 7b8c25c79cc..f9376275f55 100644 --- a/configure.ac +++ b/configure.ac @@ -4445,7 +4445,7 @@ AM_CONDITIONAL([HAVE_SHARED_CONDITIONAL], [test "X$enable_shared" = "Xyes"]) AC_CONFIG_FILES([Makefile doxygen/Doxyfile src/Makefile - src/libhdf5.settings + src/libhdf5.settings:src/libhdf5.settings.autotools.in src/H5build_settings.c:${BUILD_SETTINGS_FILE} test/Makefile test/H5srcdir_str.h diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.autotools.in similarity index 100% rename from src/libhdf5.settings.in rename to src/libhdf5.settings.autotools.in diff --git a/config/cmake/libhdf5.settings.cmake.in b/src/libhdf5.settings.cmake.in similarity index 100% rename from config/cmake/libhdf5.settings.cmake.in rename to src/libhdf5.settings.cmake.in