diff options
| author | lrknox <lrknox> | 2017-06-12 22:04:41 (GMT) |
|---|---|---|
| committer | lrknox <lrknox> | 2017-06-12 22:04:41 (GMT) |
| commit | 16e0eb3c5238d358e0db3d6b3d83ac14b5550e92 (patch) | |
| tree | b530678f2a6ce550a06ae4a69e187af22aa599f4 /config | |
| parent | 62142b4cbc374e832accf687b25c8146eaab3952 (diff) | |
| download | hdf5-16e0eb3c5238d358e0db3d6b3d83ac14b5550e92.zip hdf5-16e0eb3c5238d358e0db3d6b3d83ac14b5550e92.tar.gz hdf5-16e0eb3c5238d358e0db3d6b3d83ac14b5550e92.tar.bz2 | |
Moved libdynlib* plugin test libraries to noist_LT_LIBRARIES with added
flag '-rpath /nowhere' to stop them being installed while keeping them
from linking with libhdf5, etc.
Incremented version to 1.8.19-pre1 and ran bin/release to create tar
and zip files for testing.
Diffstat (limited to 'config')
| -rwxr-xr-x | config/cmake/scripts/HDF5config.cmake | 2 | ||||
| -rw-r--r-- | config/conclude.am | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index fb1b90f..7526f28 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -38,7 +38,7 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR) ##############################################################################
set (CTEST_SOURCE_VERSION "1.8.19")
-set (CTEST_SOURCE_VERSEXT "-pre1")
+set (CTEST_SOURCE_VERSEXT "-pre2")
##############################################################################
# handle input parameters to script.
diff --git a/config/conclude.am b/config/conclude.am index ea8bdfc..617c371 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -23,12 +23,10 @@ # be built at certain times. LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES) \ $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB) -DYN = $(dyn_LTLIBRARIES) PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS) \ $(EXTRA_PROG) chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) TESTS = $(TEST_PROG) $(TEST_SCRIPT) $(EXTRA_TEST) -dyndir=$(libdir) TEST_EXTENSIONS = .sh SH_LOG_COMPILER = $(SHELL) @@ -36,7 +34,6 @@ AM_SH_LOG_FLAGS = # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. -build-dyn: $(DYN) build-lib: $(LIB) build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(chk_TESTS) @@ -44,7 +41,7 @@ build-tests: $(LIB) $(PROGS) $(chk_TESTS) # General rule for recursive building targets. # BUILT_SOURCES contain targets that need to be built before anything else # in the directory (e.g., for Fortran type detection) -lib dyn progs tests check-s check-p :: $(BUILT_SOURCES) +lib progs tests check-s check-p :: $(BUILT_SOURCES) @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; @for d in X $(SUBDIRS); do \ if test $$d != X && test $$d != .; then \ |