diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-02-04 14:18:09 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-04 14:18:09 (GMT) |
| commit | edb1324a3aba9a297edd4b1bce7811b54c229454 (patch) | |
| tree | 70c403bcbb508c2d40c9b3b78534ac6be9cac69a /src/libhdf5.settings.in | |
| parent | 374211e79dd51b6ee0aad4c0fbd47f7c27f4fec4 (diff) | |
| download | hdf5-edb1324a3aba9a297edd4b1bce7811b54c229454.zip hdf5-edb1324a3aba9a297edd4b1bce7811b54c229454.tar.gz hdf5-edb1324a3aba9a297edd4b1bce7811b54c229454.tar.bz2 | |
Warnings merge 112 (#299)
* OESS-98 fix tools test for plugins
* sync fork
* Merge of changes from dev
* Move problem option to bottom of the list until fixed
* HDFFV-11106 - fix parsing optional args
* HDFFV-11106 add note
* grammer fix
* Whitespace after clang formatting
* Undo format version 11 changes
* Update check to working version
* Merge workflow and minor changes from develop
* Merge dev warnings changes from develop
Diffstat (limited to 'src/libhdf5.settings.in')
| -rw-r--r-- | src/libhdf5.settings.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in index 98390b8..44c1540 100644 --- a/src/libhdf5.settings.in +++ b/src/libhdf5.settings.in @@ -39,7 +39,7 @@ Languages: H5_CPPFLAGS: @H5_CPPFLAGS@ AM_CPPFLAGS: @AM_CPPFLAGS@ C Flags: @CFLAGS@ - H5 C Flags: @H5_CFLAGS@ @H5_ECFLAGS@ + H5 C Flags: @H5_CFLAGS@ AM C Flags: @AM_CFLAGS@ Shared C Library: @enable_shared@ Static C Library: @enable_static@ @@ -56,7 +56,7 @@ Languages: C++: @HDF_CXX@ @BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: @CXX_VERSION@ @BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags: @CXXFLAGS@ -@BUILD_CXX_CONDITIONAL_TRUE@ H5 C++ Flags: @H5_CXXFLAGS@ @H5_ECXXFLAGS@ +@BUILD_CXX_CONDITIONAL_TRUE@ H5 C++ Flags: @H5_CXXFLAGS@ @BUILD_CXX_CONDITIONAL_TRUE@ AM C++ Flags: @AM_CXXFLAGS@ @BUILD_CXX_CONDITIONAL_TRUE@ Shared C++ Library: @enable_shared@ @BUILD_CXX_CONDITIONAL_TRUE@ Static C++ Library: @enable_static@ |