diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-03-01 18:30:20 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-03-01 18:30:20 (GMT) |
| commit | e3fe483bf01aabb42709b1f7663655492fc8cad1 (patch) | |
| tree | 28aed9cc7ef03b26a4182a21d5b645f3d9a99a0f | |
| parent | e8237a34ba90719eba1854367cbcd3a5d3fa176f (diff) | |
| parent | 344940dd2dc894c8e1474ddd20d30886fcc74a1e (diff) | |
| download | hdf5-e3fe483bf01aabb42709b1f7663655492fc8cad1.zip hdf5-e3fe483bf01aabb42709b1f7663655492fc8cad1.tar.gz hdf5-e3fe483bf01aabb42709b1f7663655492fc8cad1.tar.bz2 | |
Merge pull request #915 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_8 to hdf5_1_8
* commit '344940dd2dc894c8e1474ddd20d30886fcc74a1e':
Merge compiler versions from develop
| -rw-r--r-- | config/cmake/libhdf5.settings.cmake.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in index 8ef67a5..c337dea 100644 --- a/config/cmake/libhdf5.settings.cmake.in +++ b/config/cmake/libhdf5.settings.cmake.in @@ -15,7 +15,7 @@ General Information: Compiling Options: ------------------ - Compilation Mode: @CMAKE_BUILD_TYPE@ + Compilation Mode: @CMAKE_BUILD_TYPE@ @CMAKE_C_COMPILER_VERSION@ C Compiler: @CMAKE_C_COMPILER@ CFLAGS: @CMAKE_C_FLAGS@ H5_CFLAGS: @H5_CFLAGS@ @@ -37,7 +37,7 @@ Compiling Options: Languages: ---------- Fortran: @HDF5_BUILD_FORTRAN@ -@BUILD_FORTRAN_CONDITIONAL_TRUE@ Fortran Compiler: @CMAKE_Fortran_COMPILER@ +@BUILD_FORTRAN_CONDITIONAL_TRUE@ Fortran Compiler: @CMAKE_Fortran_COMPILER@ @CMAKE_Fortran_COMPILER_VERSION@ @BUILD_FORTRAN_CONDITIONAL_TRUE@ Fortran 2003 Compiler: @HDF5_ENABLE_F2003@ @BUILD_FORTRAN_CONDITIONAL_TRUE@ Fortran Flags: @CMAKE_Fortran_FLAGS@ @BUILD_FORTRAN_CONDITIONAL_TRUE@ H5 Fortran Flags: @H5_FCFLAGS@ @@ -46,7 +46,7 @@ Languages: @BUILD_FORTRAN_CONDITIONAL_TRUE@ Static Fortran Library: YES C++: @HDF5_BUILD_CPP_LIB@ -@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: @CMAKE_CXX_COMPILER@ +@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@ @BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags: @CMAKE_CXX_FLAGS@ @BUILD_CXX_CONDITIONAL_TRUE@ H5 C++ Flags: @H5_CXXFLAGS@ @BUILD_CXX_CONDITIONAL_TRUE@ AM C++ Flags: @AM_CXXFLAGS@ |