diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2020-11-20 15:42:40 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-20 15:42:40 (GMT) |
commit | d605ef6ff050d01714eef828758b24e0da78ed6b (patch) | |
tree | cca570fe969b1c89ba279775a889b58d1481d4fb | |
parent | 5d0be1b196570ac2c08ffe0b61ac6a45b6ab7f3f (diff) | |
download | hdf5-d605ef6ff050d01714eef828758b24e0da78ed6b.zip hdf5-d605ef6ff050d01714eef828758b24e0da78ed6b.tar.gz hdf5-d605ef6ff050d01714eef828758b24e0da78ed6b.tar.bz2 |
hdf5 1 12 add missing files and use chkmanifest (#103)
* merge updates from develop
* remove extension on command
* Run autogen before chkmanifest
-rw-r--r-- | .github/workflows/main.yml | 1 | ||||
-rw-r--r-- | .github/workflows/pr-check.yml | 1 | ||||
-rw-r--r-- | CMakeLists.txt | 2 |
3 files changed, 3 insertions, 1 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 e7fddae..56e97d2 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 () |