diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-03-19 02:12:53 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-03-19 02:12:53 (GMT) |
| commit | 2f09d8f3c8a4a44932c1b8ffb0f6ea2219059a5c (patch) | |
| tree | 8692e294436d60a0e359730115bafeef8a7176c1 /config/cmake | |
| parent | 0f32728f728f0670e49cb712acd8e7b34fa0bcc4 (diff) | |
| download | hdf5-2f09d8f3c8a4a44932c1b8ffb0f6ea2219059a5c.zip hdf5-2f09d8f3c8a4a44932c1b8ffb0f6ea2219059a5c.tar.gz hdf5-2f09d8f3c8a4a44932c1b8ffb0f6ea2219059a5c.tar.bz2 | |
Move the GNU warnings configuration under config/gnu-warnings/ and trim
the filename prefixes. Update config/gnu-flags to suit.
I also made changes to config/cmake/HDFCompilerFlags.cmake, but I'm not
sure they're correct.
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/HDFCompilerFlags.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake index 17b0854..c395193 100644 --- a/config/cmake/HDFCompilerFlags.cmake +++ b/config/cmake/HDFCompilerFlags.cmake @@ -128,7 +128,7 @@ if (NOT MSVC AND CMAKE_COMPILER_IS_GNUCC) set (H5_CFLAGS0 "${H5_CFLAGS0} -Wsign-compare -Wtrigraphs -Wwrite-strings") endif() elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU") - ADD_H5_FLAGS (CMAKE_C_FLAGS_GENERAL "${HDF5_SOURCE_DIR}/config/gnu-warnings-general") + ADD_H5_FLAGS (CMAKE_C_FLAGS_GENERAL "${HDF5_SOURCE_DIR}/config/gnu-warnings/general") message (STATUS "CMAKE_C_FLAGS_GENERAL=${CMAKE_C_FLAGS_GENERAL}") set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_GENERAL}") set (H5_CFLAGS0 "${H5_CFLAGS0} -Wbad-function-cast -Wcast-align") @@ -154,12 +154,12 @@ if (NOT MSVC AND CMAKE_COMPILER_IS_GNUCC) if (CMAKE_C_COMPILER_ID STREQUAL "Intel") set (H5_CFLAGS0 "${H5_CFLAGS0} -Winline -Wreorder -Wport -Wstrict-aliasing") elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU") - ADD_H5_FLAGS (CMAKE_C_FLAGS_DEV_GENERAL "${HDF5_SOURCE_DIR}/config/gnu-warnings-developer-general") + ADD_H5_FLAGS (CMAKE_C_FLAGS_DEV_GENERAL "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-general") set (H5_CFLAGS0 "${H5_CFLAGS0} ${CMAKE_C_FLAGS_DEV_GENERAL}") endif () else () if (CMAKE_C_COMPILER_ID STREQUAL "GNU") - ADD_H5_FLAGS (CMAKE_C_FLAGS_NO_DEV_GENERAL "${HDF5_SOURCE_DIR}/config/gnu-warnings-no-developer-general") + ADD_H5_FLAGS (CMAKE_C_FLAGS_NO_DEV_GENERAL "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-general") set (H5_CFLAGS0 "${H5_CFLAGS0} ${CMAKE_C_FLAGS_NO_DEV_GENERAL}") endif () endif () |