diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-01-19 22:39:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 22:39:23 (GMT) |
| commit | a0ee1eb5dc7ad3f45860eb5ea0791a4380302ddf (patch) | |
| tree | 1a88b6615ef1e6f281ce4e34c66c393a3193f5e2 /config/cmake/HDFCompilerFlags.cmake | |
| parent | a63a1c8a57bd313a0f63c3f39fc18965500c304f (diff) | |
| download | hdf5-a0ee1eb5dc7ad3f45860eb5ea0791a4380302ddf.zip hdf5-a0ee1eb5dc7ad3f45860eb5ea0791a4380302ddf.tar.gz hdf5-a0ee1eb5dc7ad3f45860eb5ea0791a4380302ddf.tar.bz2 | |
1 12 merge of changes from dev (#271)
* 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
Diffstat (limited to 'config/cmake/HDFCompilerFlags.cmake')
| -rw-r--r-- | config/cmake/HDFCompilerFlags.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake index 31af2f8..b813924 100644 --- a/config/cmake/HDFCompilerFlags.cmake +++ b/config/cmake/HDFCompilerFlags.cmake @@ -15,7 +15,9 @@ set(CMAKE_C_STANDARD_REQUIRED TRUE) set (CMAKE_C_FLAGS "${CMAKE_C99_STANDARD_COMPILE_OPTION} ${CMAKE_C_FLAGS}") set (CMAKE_C_FLAGS "${CMAKE_C_SANITIZER_FLAGS} ${CMAKE_C_FLAGS}") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_SANITIZER_FLAGS} ${CMAKE_CXX_FLAGS}") -message (STATUS "Warnings Configuration: default: ${CMAKE_C_FLAGS} : ${CMAKE_CXX_FLAGS}") +if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0") + message (VERBOSE "Warnings Configuration: default: ${CMAKE_C_FLAGS} : ${CMAKE_CXX_FLAGS}") +endif () #----------------------------------------------------------------------------- # Compiler specific flags : Shouldn't there be compiler tests for these #----------------------------------------------------------------------------- @@ -107,7 +109,9 @@ if (NOT MSVC AND NOT MINGW) elseif (CMAKE_C_COMPILER_ID STREQUAL "PGI") list (APPEND HDF5_CMAKE_C_FLAGS "-Minform=inform") endif () - message (STATUS "CMAKE_C_FLAGS_GENERAL=${HDF5_CMAKE_C_FLAGS}") + if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0") + message (VERBOSE "CMAKE_C_FLAGS_GENERAL=${HDF5_CMAKE_C_FLAGS}") + endif () endif () #----------------------------------------------------------------------------- @@ -132,7 +136,6 @@ if (NOT MSVC AND NOT MINGW) endif () endif () - if (CMAKE_C_COMPILER_ID STREQUAL "GNU") # Technically, variable-length arrays are part of the C99 standard, but # we should approach them a bit cautiously... Only needed for gcc 4.X |