summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-03-04 12:29:10 (GMT)
committerGitHub <noreply@github.com>2021-03-04 12:29:10 (GMT)
commitfab95ce7b309e3cb43cc9dc25c08da986f5d0e58 (patch)
tree39a30531064f0af64a2fe8767b27365cd06b2a91 /config
parentf2a15528228f9e67ed3bc8121ac888bf2b962823 (diff)
downloadhdf5-fab95ce7b309e3cb43cc9dc25c08da986f5d0e58.zip
hdf5-fab95ce7b309e3cb43cc9dc25c08da986f5d0e58.tar.gz
hdf5-fab95ce7b309e3cb43cc9dc25c08da986f5d0e58.tar.bz2
Changes found during merge to 1.12 (#414)
* OESS-98 convert plugin option to FetchContent, add tests * Fixes for pkcfg files because of plugin option * OESS-98 fix tools test for plugins * Keep doxygen comments under 100 chars long - format hint * Whitespace * HDFFV-11144 - Reclassify CMake messages * HDFFV-11099/11100 added help text * Reworked switch statement to compare string instead * Fix typo * Update CDash mode * Correct name of threadsafe * Correct option name * Undo accidental commit * Note LLVM 10 to 11 format default changes * Update format plugin * Undo clang-format version 11 changes * One more correction * Update supported platforms * Revert whitespace changes * Correct whitespace * Changes from PR#3 * HDFFV-11213 added option to control gcc10 warnings diagnostics * HDFFV-11212 Use the new references correctly in JNI utility and tests * format source * Fix typo * Add new test file * HDFFV-11212 - update test and remove unused arg * Minor non-space formatting changes * Use H5I_INVALID_ID instead of "-1" * source formatting * add missing testfile, update jni function * Undo commit of debug code * remove mislocated file * Fix h5repack test for handling of fapls and id close * Update h5diff test files usage text * HDFFV-11212 add new ref tests for JNI export dataset * src format update * Remove blank line typo * src format typo * long double requires %Lg * Another long double foramt specifer S.B. %Lg * issue with t128bit test * Windows issue with h5dump and type. * Fix review issues * refactor function nesting and fix error checks * format fixes * Remove untested functions and javadoc quiet comments * Restore TRY block. * Change string append errors to memory exception * revert to H5_JNI_FATAL_ERROR - support functions need work * Add assertion error for h5util functions * remove duplicate function * format fix * Revert HD function error handling * Update copyright comments * GH #386 java folder copyright corrections * Whitespace * GH #359 implement and fix tools 1.6 API usage * remove excessive comments * Flip inits to correct ifdef section * rework ifdef to be simpler * format issue * Reformat ifdef inits * remove static attribute * format compliance * Update names * Revert because logic relies on float not being int * Changes noticed from creating merge of #412 * Double underscore change * Correct compiler version variable used * Remove header guard underscores * Whitespace cleanup
Diffstat (limited to 'config')
-rw-r--r--config/cmake/HDF5PluginCache.cmake2
-rw-r--r--config/gnu-cxxflags2
-rw-r--r--config/gnu-fflags2
3 files changed, 3 insertions, 3 deletions
diff --git a/config/cmake/HDF5PluginCache.cmake b/config/cmake/HDF5PluginCache.cmake
index 2b9e48c..3b085dd 100644
--- a/config/cmake/HDF5PluginCache.cmake
+++ b/config/cmake/HDF5PluginCache.cmake
@@ -20,7 +20,7 @@ set (HDF5_REPACK_EXECUTABLE $<TARGET_FILE:h5repack-shared> CACHE STRING "hdf5 h5
set (H5PL_ALLOW_EXTERNAL_SUPPORT "${HDF5_ALLOW_EXTERNAL_SUPPORT}" CACHE STRING "Allow External Library Building (NO GIT TGZ)" FORCE)
-set (H5PL_GIT_URL "https://git@bitbucket.hdfgroup.org/scm/test/h5plugin.git" CACHE STRING "Use plugins from HDF repository" FORCE)
+set (H5PL_GIT_URL "https://github.com/HDFGroup/hdf5_plugins.git" CACHE STRING "Use plugins from HDF repository" FORCE)
set (H5PL_GIT_BRANCH "master" CACHE STRING "" FORCE)
set (H5PL_TGZ_NAME "${PLUGIN_TGZ_NAME}" CACHE STRING "Use plugins from compressed file" FORCE)
diff --git a/config/gnu-cxxflags b/config/gnu-cxxflags
index 3fe13d8..cba8298 100644
--- a/config/gnu-cxxflags
+++ b/config/gnu-cxxflags
@@ -148,7 +148,7 @@ if test "X-g++" = "X-$cxx_vendor"; then
# Enhanced Diagnostics #
########################
- if test $cc_vers_major -ge 10; then
+ if test $cxx_vers_major -ge 10; then
NO_DIAGS_CXXFLAGS="-fdiagnostics-urls=never -fno-diagnostics-color"
fi
DIAGS_CXXFLAGS=
diff --git a/config/gnu-fflags b/config/gnu-fflags
index d4f876d..ec4fcab 100644
--- a/config/gnu-fflags
+++ b/config/gnu-fflags
@@ -109,7 +109,7 @@ if test "X-gfortran" = "X-$f9x_vendor"; then
# Enhanced Diagnostics #
########################
- if test $cc_vers_major -ge 10; then
+ if test $f9x_vers_major -ge 10; then
NO_DIAGS_FCFLAGS="-fdiagnostics-urls=never -fno-diagnostics-color"
fi
DIAGS_FCFLAGS=