diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2020-04-08 23:13:11 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2020-04-08 23:13:11 (GMT) |
commit | 9c0b57114928df01b4a45e69e786de8fc76783d2 (patch) | |
tree | d60c5e8edd3a1c55f8cc2abdfc2905e505023754 | |
parent | b27a20f8c0e286ea7c2836605632ea2ee5522d03 (diff) | |
parent | e6cd19937b0e5fe5b49f7e88b08f15305e0b5af1 (diff) | |
download | hdf5-9c0b57114928df01b4a45e69e786de8fc76783d2.zip hdf5-9c0b57114928df01b4a45e69e786de8fc76783d2.tar.gz hdf5-9c0b57114928df01b4a45e69e786de8fc76783d2.tar.bz2 |
Merge pull request #2501 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:Wflags_changes_develop_merge to develop
* commit 'e6cd19937b0e5fe5b49f7e88b08f15305e0b5af1':
Squashed commit of the following:
Add \d to list of characters allowed after '-' in versions.
-rwxr-xr-x | bin/h5vers | 2 | ||||
-rw-r--r-- | config/gnu-cxxflags | 7 | ||||
-rw-r--r-- | config/gnu-fflags | 2 |
3 files changed, 6 insertions, 5 deletions
@@ -213,7 +213,7 @@ my (@curver) = getvers $contents; # Determine the new version number. my @newver; #new version if ($set) { - if ($set =~ /(\d+)\.(\d+)\.(\d+)(-([a-zA-Z]\w*))?/) { + if ($set =~ /(\d+)\.(\d+)\.(\d+)(-([\da-zA-Z]\w*))?/) { @newver = ($1, $2, $3, $5); } elsif ($set =~ /(\d+)\D+(\d+)\D+(\d+)(\s*\(([a-zA-Z]\w*)\))?\D*$/) { @newver = ($1, $2, $3, $5); diff --git a/config/gnu-cxxflags b/config/gnu-cxxflags index 9ae38f6..73f49ba 100644 --- a/config/gnu-cxxflags +++ b/config/gnu-cxxflags @@ -306,9 +306,10 @@ fi # Version-specific g++ flags - - # Append more extra warning flags that only gcc 4.9+ know about - -Wopenmp-simd" +# This flag was left behind when moving warnings flags to common files for +# both autotools and CMake. +# # Append more extra warning flags that only gcc 4.9+ know about +# -Wopenmp-simd" # Clear cxx info if no flags set if test "X$cxx_flags_set" = "X"; then diff --git a/config/gnu-fflags b/config/gnu-fflags index 2859158..f58f10c 100644 --- a/config/gnu-fflags +++ b/config/gnu-fflags @@ -139,7 +139,7 @@ if test "X-gfortran" = "X-$f9x_vendor"; then # General # ########### - H5_FCFLAGS="$H5_CFLAGS $(load_gnu_arguments gfort-general)" + H5_FCFLAGS="$H5_FCFLAGS $(load_gnu_arguments gfort-general)" ############################# # Version-specific warnings # |