diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-12-01 22:32:34 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-01 22:32:34 (GMT) |
| commit | 96a4e101023d0926f714e2dbec2e4ffca45abc16 (patch) | |
| tree | aa05fd324747b247d140190979f58f34abf51ec9 | |
| parent | cf232a757fb7500f6c0bf3ed7b7eaaa4be724c1d (diff) | |
| download | hdf5-96a4e101023d0926f714e2dbec2e4ffca45abc16.zip hdf5-96a4e101023d0926f714e2dbec2e4ffca45abc16.tar.gz hdf5-96a4e101023d0926f714e2dbec2e4ffca45abc16.tar.bz2 | |
Add aarch64 toolchain and change dump test to long opt (#2271)
| -rw-r--r-- | config/toolchain/aarch64.cmake | 17 | ||||
| -rw-r--r-- | tools/test/h5dump/CMakeTests.cmake | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/config/toolchain/aarch64.cmake b/config/toolchain/aarch64.cmake new file mode 100644 index 0000000..adb8639 --- /dev/null +++ b/config/toolchain/aarch64.cmake @@ -0,0 +1,17 @@ +set(TOOLCHAIN_PREFIX aarch64-linux-gnu) +set(ANDROID_NDK /opt/android-ndk-r25b-linux/android-ndk-r25b) +set (CMAKE_SYSTEM_NAME Android) +set (CMAKE_ANDROID_ARCH_ABI x86_64) +#set (CMAKE_ANDROID_STANDALONE_TOOLCHAIN ${ANDROID_NDK}/build/cmake/andriod.toolchain.cmake) +set (CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc) +set (CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++) +#set (CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres) +set (CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran) +set (CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX}) +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_CROSSCOMPILING_EMULATOR qemu-aarch64) + +include_directories(/usr/${TOOLCHAIN_PREFIX}/include) + diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake index 7c2d64e..bcbb1c1 100644 --- a/tools/test/h5dump/CMakeTests.cmake +++ b/tools/test/h5dump/CMakeTests.cmake @@ -1312,7 +1312,7 @@ ADD_H5ERR_MASK_TEST (torderlinks2 0 "unable to open external file, external link file name = 'fname'" --enable-error-stack --sort_by=name --sort_order=descending tfcontents1.h5) # tests for floating point user defined printf format - ADD_H5_TEST (tfpformat 0 --enable-error-stack -m %.7f tfpformat.h5) + ADD_H5_TEST (tfpformat 0 --enable-error-stack --format=%.7f tfpformat.h5) # tests for traversal of external links ADD_H5ERR_MASK_TEST (textlinksrc 0 "Too many soft links in path" --enable-error-stack textlinksrc.h5) |