diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-03-13 15:05:09 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-03-13 15:05:09 (GMT) |
| commit | f5689224b5faaf01c02a1a4ae2a0a71b9f46e1d0 (patch) | |
| tree | 002ab3ddcf0e96739169337ea0e72d785fe73944 /hl/c++ | |
| parent | b17f3e418335b0468f3f6d6956b2d6adeb9b5cf7 (diff) | |
| download | hdf5-f5689224b5faaf01c02a1a4ae2a0a71b9f46e1d0.zip hdf5-f5689224b5faaf01c02a1a4ae2a0a71b9f46e1d0.tar.gz hdf5-f5689224b5faaf01c02a1a4ae2a0a71b9f46e1d0.tar.bz2 | |
[svn-r24789] Bump up the minimum cmake version
Diffstat (limited to 'hl/c++')
| -rw-r--r-- | hl/c++/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | hl/c++/examples/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | hl/c++/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | hl/c++/src/Makefile.am | 2 | ||||
| -rw-r--r-- | hl/c++/src/Makefile.in | 8 | ||||
| -rw-r--r-- | hl/c++/test/CMakeLists.txt | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/hl/c++/CMakeLists.txt b/hl/c++/CMakeLists.txt index d641eae..386f5a6 100644 --- a/hl/c++/CMakeLists.txt +++ b/hl/c++/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8.10) +cmake_minimum_required (VERSION 2.8.11) PROJECT (HDF5_HL_CPP) #----------------------------------------------------------------------------- diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt index ca086db..8f9b43f 100644 --- a/hl/c++/examples/CMakeLists.txt +++ b/hl/c++/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8.10) +cmake_minimum_required (VERSION 2.8.11) PROJECT (HDF5_HL_CPP_EXAMPLES) #----------------------------------------------------------------------------- diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt index 9f8d3f8..39c6737 100644 --- a/hl/c++/src/CMakeLists.txt +++ b/hl/c++/src/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8.10) +cmake_minimum_required (VERSION 2.8.11) PROJECT (HDF5_HL_CPP_SRC) #----------------------------------------------------------------------------- diff --git a/hl/c++/src/Makefile.am b/hl/c++/src/Makefile.am index 7961747..03289c0 100644 --- a/hl/c++/src/Makefile.am +++ b/hl/c++/src/Makefile.am @@ -22,7 +22,7 @@ include $(top_srcdir)/config/commence.am include $(top_srcdir)/config/lt_vers.am # Include src directory -INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src +AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src # This is our main target lib_LTLIBRARIES=libhdf5_hl_cpp.la diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 235cb81..c13f26a 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -187,7 +187,10 @@ AMTAR = @AMTAR@ # instead of CFLAGS, as CFLAGS is reserved solely for the user to define. # This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well. AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@ -AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ + +# Include src directory +AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src \ + -I$(top_srcdir)/hl/src AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ @@ -463,9 +466,6 @@ LT_VERS_INTERFACE = 6 LT_VERS_REVISION = 165 LT_VERS_AGE = 0 -# Include src directory -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src - # This is our main target lib_LTLIBRARIES = libhdf5_hl_cpp.la diff --git a/hl/c++/test/CMakeLists.txt b/hl/c++/test/CMakeLists.txt index 82a4df0..4a7523c 100644 --- a/hl/c++/test/CMakeLists.txt +++ b/hl/c++/test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8.10) +cmake_minimum_required (VERSION 2.8.11) PROJECT (HDF5_HL_CPP_TEST) #----------------------------------------------------------------------------- |