diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2020-04-07 14:54:20 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2020-04-07 14:54:20 (GMT) |
commit | 8d2de5906b4257f44c08f22cfecafb8ff3a2a9dd (patch) | |
tree | 49545eeb27ea6e18e5bbacb627708b6916d806ab /CMakeLists.txt | |
parent | 9f2f5b2626dfb1f83d7361296a80e496a40633ab (diff) | |
download | hdf5-8d2de5906b4257f44c08f22cfecafb8ff3a2a9dd.zip hdf5-8d2de5906b4257f44c08f22cfecafb8ff3a2a9dd.tar.gz hdf5-8d2de5906b4257f44c08f22cfecafb8ff3a2a9dd.tar.bz2 |
TRILAB-192 - merge changes from develop
Single source, config files, for warnings for both autotools and CMake.
Update CMake libraries, tools, tests to use correct flags.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d3f4b52..1fadc18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -813,6 +813,9 @@ if (EXISTS "${HDF5_SOURCE_DIR}/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/for include (${HDF_RESOURCES_EXT_DIR}/HDFUseFortran.cmake) + message (STATUS "Fortran compiler ID is ${CMAKE_Fortran_COMPILER_ID}") + include (${HDF_RESOURCES_DIR}/HDFFortranCompilerFlags.cmake) + include (${HDF_RESOURCES_DIR}/HDF5UseFortran.cmake) set (LINK_Fortran_LIBS ${LINK_LIBS}) if (HDF5_ENABLE_F2003) @@ -856,6 +859,7 @@ if (EXISTS "${HDF5_SOURCE_DIR}/c++" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/c++") endif () include (${HDF_RESOURCES_EXT_DIR}/HDFUseCXX.cmake) + include (${HDF_RESOURCES_DIR}/HDFCXXCompilerFlags.cmake) if (CMAKE_NO_STD_NAMESPACE) set (H5_NO_STD 1) |