summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2023-02-16 13:23:09 (GMT)
committerGitHub <noreply@github.com>2023-02-16 13:23:09 (GMT)
commitaf9659d8475123d25f2235ef09b39567c4e2dde0 (patch)
treeb94ef18a88c9c0a18f1cd027cf19f7d1487440da /config
parent5b79bb2f0f0c9722da2236deef2875291bdb7bde (diff)
downloadhdf5-af9659d8475123d25f2235ef09b39567c4e2dde0.zip
hdf5-af9659d8475123d25f2235ef09b39567c4e2dde0.tar.gz
hdf5-af9659d8475123d25f2235ef09b39567c4e2dde0.tar.bz2
1.10: Add spelling check to CI and fix errors. (#2442)
* Update CI and support files to match latest from 1.14 * Correct spelling * More spelling corrections * spelling fixes in testpar * Fix spelling errors in tools * More tools spelling fixes * Spelling fixes for rest of tools and some src * Fix spelling errors in src files, pt 2 * Fix spelling in src pt3 * Fix spelling errors pt4 * Fix spelling errors pt5 * Spelling fix pt6 * fix spelling error examples * fix spelling in tests * fix spelling errors in test pt2 * Fix spelling errors in test pt3 * fix spelling in test pt4 * Fix spelling errors in hl * fix spelling errors in c++ * Spelling fixes for fortran * spelling fixes for bin and java * Add relative path * Change spelling action to use a file for list of ignore words * Fix spelling ignore list * remove unused file
Diffstat (limited to 'config')
-rw-r--r--config/cmake/HDFFortranCompilerFlags.cmake2
-rw-r--r--config/cmake_ext_mod/HDFUseCXX.cmake2
-rw-r--r--config/ibm-aix4
-rw-r--r--config/ibm-flags2
-rw-r--r--config/toolchain/aarch64.cmake17
-rw-r--r--config/toolchain/gcc.cmake (renamed from config/toolchain/GCC.cmake)0
-rw-r--r--config/toolchain/intel.cmake13
-rw-r--r--config/toolchain/intel_classic.cmake11
-rw-r--r--config/toolchain/pgi.cmake (renamed from config/toolchain/PGI.cmake)0
9 files changed, 36 insertions, 15 deletions
diff --git a/config/cmake/HDFFortranCompilerFlags.cmake b/config/cmake/HDFFortranCompilerFlags.cmake
index 84b3ebe..599ec30 100644
--- a/config/cmake/HDFFortranCompilerFlags.cmake
+++ b/config/cmake/HDFFortranCompilerFlags.cmake
@@ -62,7 +62,7 @@ if (NOT MSVC AND NOT MINGW)
# General flags
if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/ifort-general")
- list (APPEND HDF5_CMAKE_Fortran_FLAGS "-stand f03" "-free")
+ list (APPEND HDF5_CMAKE_Fortran_FLAGS "-stand:f03" "-free")
elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-general")
list (APPEND HDF5_CMAKE_Fortran_FLAGS "-ffree-form" "-fimplicit-none")
diff --git a/config/cmake_ext_mod/HDFUseCXX.cmake b/config/cmake_ext_mod/HDFUseCXX.cmake
index fcd3ba6..6788773 100644
--- a/config/cmake_ext_mod/HDFUseCXX.cmake
+++ b/config/cmake_ext_mod/HDFUseCXX.cmake
@@ -17,7 +17,7 @@ ENABLE_LANGUAGE (CXX)
set (HDF_PREFIX "H5")
#-------------------------------------------------------------------------------
-# Fix CXX flags if we are compiling staticly on Windows using
+# Fix CXX flags if we are compiling statically on Windows using
# Windows_MT.cmake from config/cmake/UserMacros
#-------------------------------------------------------------------------------
if (BUILD_STATIC_CRT_LIBS)
diff --git a/config/ibm-aix b/config/ibm-aix
index f48f9d8..8720db2 100644
--- a/config/ibm-aix
+++ b/config/ibm-aix
@@ -58,7 +58,7 @@ if test "X-" = "X-$f9x_flags_set"; then
H5_FCFLAGS="$H5_FCFLAGS ${F9XSUFFIXFLAG}"
FSEARCH_DIRS="-I./ -I../src"
- # Produciton
+ # Production
PROD_FCFLAGS=
# Debug
@@ -109,7 +109,7 @@ case $CC_BASENAME in
# Use very generic flags
H5_CFLAGS="$H5_CFLAGS -ansi"
- # Produciton
+ # Production
PROD_CFLAGS=
# Debug
diff --git a/config/ibm-flags b/config/ibm-flags
index ab4b8ff..f3f247c 100644
--- a/config/ibm-flags
+++ b/config/ibm-flags
@@ -62,7 +62,7 @@ if test "XL" = "$cc_vendor"; then
# concerning the portability of __inline__.
H5_CFLAGS="-qlanglvl=stdc99 -qflag=w:w $H5_CFLAGS"
- # Produciton
+ # Production
PROD_CFLAGS=
# Debug
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/config/toolchain/GCC.cmake b/config/toolchain/gcc.cmake
index c41d0ca..c41d0ca 100644
--- a/config/toolchain/GCC.cmake
+++ b/config/toolchain/gcc.cmake
diff --git a/config/toolchain/intel.cmake b/config/toolchain/intel.cmake
index ae1d2f8..f8f60b2 100644
--- a/config/toolchain/intel.cmake
+++ b/config/toolchain/intel.cmake
@@ -3,16 +3,9 @@
set(CMAKE_COMPILER_VENDOR "intel")
-if(USE_SANITIZER)
- set(CMAKE_C_COMPILER icl)
- set(CMAKE_CXX_COMPILER icl++)
- set(CMAKE_Fortran_COMPILER ifort)
- set(INTEL_CLANG ON)
-else ()
- set(CMAKE_C_COMPILER icc)
- set(CMAKE_CXX_COMPILER icpc)
- set(CMAKE_Fortran_COMPILER ifort)
-endif ()
+set(CMAKE_C_COMPILER icx)
+set(CMAKE_CXX_COMPILER icpx)
+set(CMAKE_Fortran_COMPILER ifx)
# the following is used if cross-compiling
set(CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/intel_classic.cmake b/config/toolchain/intel_classic.cmake
new file mode 100644
index 0000000..97f6a64
--- /dev/null
+++ b/config/toolchain/intel_classic.cmake
@@ -0,0 +1,11 @@
+# Uncomment the following to use cross-compiling
+#set(CMAKE_SYSTEM_NAME Linux)
+
+set(CMAKE_COMPILER_VENDOR "intel")
+
+set(CMAKE_C_COMPILER icc)
+set(CMAKE_CXX_COMPILER icpc)
+set(CMAKE_Fortran_COMPILER ifort)
+
+# the following is used if cross-compiling
+set(CMAKE_CROSSCOMPILING_EMULATOR "")
diff --git a/config/toolchain/PGI.cmake b/config/toolchain/pgi.cmake
index ec58cbb..ec58cbb 100644
--- a/config/toolchain/PGI.cmake
+++ b/config/toolchain/pgi.cmake