summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2014-04-07 17:26:44 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2014-04-07 17:26:44 (GMT)
commitab2d9f1e9c44502f6dfe69969974a99d2953159d (patch)
tree32d9a9298ab53b766baf1486704ca4ddd9b61d4b /config
parentfadc2d8c61c975cd6a64443ffbaa9ff6999a2419 (diff)
downloadhdf5-ab2d9f1e9c44502f6dfe69969974a99d2953159d.zip
hdf5-ab2d9f1e9c44502f6dfe69969974a99d2953159d.tar.gz
hdf5-ab2d9f1e9c44502f6dfe69969974a99d2953159d.tar.bz2
[svn-r24980] HDFFV-8290: Merge automake 1.14.1 changes from trunk
Tested: h5committest
Diffstat (limited to 'config')
-rw-r--r--config/Makefile.am.blank2
-rw-r--r--config/cmake/CTestCustom.cmake34
2 files changed, 18 insertions, 18 deletions
diff --git a/config/Makefile.am.blank b/config/Makefile.am.blank
index 05799fc..a54c734 100644
--- a/config/Makefile.am.blank
+++ b/config/Makefile.am.blank
@@ -40,7 +40,7 @@
include $(top_srcdir)/config/commence.am
# Add include directories to the C preprocessor flags
-INCLUDES=-I$(top_srcdir)/src
+AM_CPPFLAGS+=-I$(top_srcdir)/src
# Our main targets, the library foo.la and the programs bar and baz
lib_LTLIBRARIES=foo.la
diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index b1178b0..4df2c8c 100644
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -19,24 +19,24 @@ set (CTEST_CUSTOM_WARNING_EXCEPTION
set (CTEST_CUSTOM_MEMCHECK_IGNORE
${CTEST_CUSTOM_MEMCHECK_IGNORE}
- flush1 #designed to fail
- flush2 #designed to need flush1
- error_test #uses runTest.cmake
- err_compat #uses runTest.cmake
- links_env #uses runTest.cmake
- testlibinfo #uses grepTest.cmake
- h5test-clear-testhdf5-objects
- h5test-clear-objects
- h5test-clear-cache-objects
- h5test-clear-cache_api-objects
- h5test-clear-ttsafe-objects
- h5test-clear-err_compat-objects
- h5test-clear-error_test-objects
- h5test-clear-links_env-objects
+ H5TEST-flush1 #designed to fail
+ H5TEST-flush2 #designed to need flush1
+ H5TEST-error_test #uses runTest.cmake
+ H5TEST-err_compat #uses runTest.cmake
+ H5TEST-links_env #uses runTest.cmake
+ H5TEST-testlibinfo #uses grepTest.cmake
+ H5TEST-clear-testhdf5-objects
+ H5TEST-clear-objects
+ H5TEST-clear-cache-objects
+ H5TEST-clear-cache_api-objects
+ H5TEST-clear-ttsafe-objects
+ H5TEST-clear-err_compat-objects
+ H5TEST-clear-error_test-objects
+ H5TEST-clear-links_env-objects
PERFORM_h5perform-clear-objects
HL_TOOLS-clear-objects
- hl_test-clear-objects
- hl_fortran_test-clear-objects
+ HL_test-clear-objects
+ HL_fortran_test-clear-objects
######### tools/h5copy #########
H5COPY-clearall-objects
######### tools/h5diff #########
@@ -210,5 +210,5 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
H5MKGRP-clearall-objects
######### examples #########
EXAMPLES-clear-objects
- cpp_ex-clear-objects
+ CPP_ex-clear-objects
)