summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2020-11-20 21:11:37 (GMT)
committerGitHub <noreply@github.com>2020-11-20 21:11:37 (GMT)
commit541fcd89bc5268a2025d57565fc0044c4707b414 (patch)
tree3d777409cb643dd2cbf10572e15b876b41f7b316
parentc421ecca2c0b662bedee45484fd2bff774413dc2 (diff)
downloadhdf5-541fcd89bc5268a2025d57565fc0044c4707b414.zip
hdf5-541fcd89bc5268a2025d57565fc0044c4707b414.tar.gz
hdf5-541fcd89bc5268a2025d57565fc0044c4707b414.tar.bz2
hdf5 1 10 merge changes from dev (#107)
* Merge changes from 1.12/dev * Add chkmanifest
-rw-r--r--.github/workflows/main.yml1
-rw-r--r--.github/workflows/pr-check.yml1
-rw-r--r--CMakeLists.txt2
-rw-r--r--MANIFEST1
-rw-r--r--release_docs/RELEASE.txt3
5 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a7faaa7..c891bac 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -106,6 +106,7 @@ jobs:
if: matrix.generator == 'autogen'
run: |
sh ./autogen.sh
+ sh ./bin/chkmanifest
mkdir "${{ runner.workspace }}/build"
cd "${{ runner.workspace }}/build"
$GITHUB_WORKSPACE/configure --enable-shared --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --enable-java
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
index 7cce4d0..47feb7a 100644
--- a/.github/workflows/pr-check.yml
+++ b/.github/workflows/pr-check.yml
@@ -100,6 +100,7 @@ jobs:
if: matrix.generator == 'autogen'
run: |
sh ./autogen.sh
+ sh ./bin/chkmanifest
mkdir "${{ runner.workspace }}/build"
cd "${{ runner.workspace }}/build"
$GITHUB_WORKSPACE/configure --enable-shared --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --enable-java
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd12c8b..90450a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -603,7 +603,7 @@ if (MSVC)
endif ()
set (MAKE_SYSTEM)
-if (CMAKE_BUILD_TOOL MATCHES "make")
+if (CMAKE_MAKE_PROGRAM MATCHES "make")
set (MAKE_SYSTEM 1)
endif ()
diff --git a/MANIFEST b/MANIFEST
index 282f612..d3c089c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -194,6 +194,7 @@
./doxygen/aliases
./doxygen/Doxyfile.in
+./doxygen/dox/api-compat-macros.dox
./doxygen/dox/mainpage.dox
./doxygen/dox/rm-template.dox
./doxygen/examples/H5Fclose.c
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index bb31fc8..0113691 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -396,9 +396,6 @@ option.
CMake: h5c++, h5cc, h5hlc++, h5hlcc
The include folder holds the header files and the fortran mod files. CMake
-the share folder.
-
-The bin folder contains the tools and the build scripts. Additionally, CMake
places the fortran mod files into separate shared and static subfolders,
while Autotools places one set of mod files into the include folder. Because
CMake produces a tools library, the header files for tools will appear in