summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2023-05-16 23:38:40 (GMT)
committerGitHub <noreply@github.com>2023-05-16 23:38:40 (GMT)
commitdd82e186ff1719303f07a1c11c08f0905eb6c177 (patch)
tree4db6a5db1f15ab661051d04d9b5540c986d7a863
parent8af30f782015ad415c104216c66716f720296cbb (diff)
downloadhdf5-dd82e186ff1719303f07a1c11c08f0905eb6c177.zip
hdf5-dd82e186ff1719303f07a1c11c08f0905eb6c177.tar.gz
hdf5-dd82e186ff1719303f07a1c11c08f0905eb6c177.tar.bz2
Update name of DT action and install text (#2966)
-rw-r--r--.github/workflows/cmake-ctest.yml2
-rw-r--r--.github/workflows/daily-build.yml9
-rw-r--r--.github/workflows/tarball.yml2
-rw-r--r--config/toolchain/aarch64.cmake8
-rw-r--r--release_docs/INSTALL_CMake.txt4
5 files changed, 16 insertions, 9 deletions
diff --git a/.github/workflows/cmake-ctest.yml b/.github/workflows/cmake-ctest.yml
index c21872d..9a05afd 100644
--- a/.github/workflows/cmake-ctest.yml
+++ b/.github/workflows/cmake-ctest.yml
@@ -1,4 +1,4 @@
-name: hdf5 dev ctest runs
+name: hdf5 1.14 ctest runs
# Controls when the action will run. Triggers the workflow on a schedule
on:
diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
index 0e040ca..8770c56 100644
--- a/.github/workflows/daily-build.yml
+++ b/.github/workflows/daily-build.yml
@@ -1,4 +1,4 @@
-name: hdf5 dev daily build
+name: hdf5 1.14 daily build
# Controls when the action will run. Triggers the workflow on a schedule
on:
@@ -19,3 +19,10 @@ jobs:
file_base: ${{ needs.call-workflow-tarball.outputs.file_base }}
if: ${{ needs.call-workflow-tarball.outputs.has_changes == 'true' }}
+ call-workflow-release:
+ needs: call-workflow-ctest
+ uses: ./.github/workflows/release.yml
+ with:
+ file_base: ${{ needs.call-workflow-tarball.outputs.file_base }}
+ if: ${{ needs.call-workflow-tarball.outputs.has_changes == 'true' }}
+
diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml
index 12f3438..54a601c 100644
--- a/.github/workflows/tarball.yml
+++ b/.github/workflows/tarball.yml
@@ -1,4 +1,4 @@
-name: hdf5 dev tarball
+name: hdf5 1.14 tarball
# Controls when the action will run. Triggers the workflow on a schedule
on:
diff --git a/config/toolchain/aarch64.cmake b/config/toolchain/aarch64.cmake
index 6996833..fd216a9 100644
--- a/config/toolchain/aarch64.cmake
+++ b/config/toolchain/aarch64.cmake
@@ -1,7 +1,7 @@
set(TOOLCHAIN_PREFIX aarch64-linux-gnu)
-set(ANDROID_NDK /opt/android-ndk-linux)
-set (CMAKE_SYSTEM_NAME Android)
-set (CMAKE_ANDROID_ARCH_ABI x86_64)
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+#set (CMAKE_ANDROID_ARCH_ABI x86_64)
#set (CMAKE_ANDROID_STANDALONE_TOOLCHAIN ${ANDROID_NDK}/build/cmake/android.toolchain.cmake)
set (CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
set (CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
@@ -12,7 +12,7 @@ set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set (CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-set (CMAKE_CROSSCOMPILING_EMULATOR qemu-aarch64)
+set(CMAKE_CROSSCOMPILING_EMULATOR "qemu-aarch64-static;-L;/usr/aarch64-linux-gnu/" CACHE FILEPATH "Path to the emulator for the target system.")
include_directories(/usr/${TOOLCHAIN_PREFIX}/include)
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 34ac936..c4dc02a 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -210,10 +210,10 @@ Notes: This short set of instructions is written for users who want to
5. Configure the C library, tools and tests with one of the following commands:
On Windows 32 bit
- cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ..\hdf5-1.15."X"
+ cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ..\hdf5-1.14."X"
On Windows 64 bit
- cmake -G "Visual Studio 16 2019 Win64" -A x64 -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ..\hdf5-1.15."X"
+ cmake -G "Visual Studio 16 2019 Win64" -A x64 -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ..\hdf5-1.14."X"
On Linux and Mac
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ../hdf5-1.14."X"