diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-07-15 15:27:06 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-07-15 15:27:06 (GMT) |
| commit | 271208dceb7f0f81d8a2db27475ebb63a26a3562 (patch) | |
| tree | 258e90a1eb8a57591f3e796a39e5813ff9299b6c /config | |
| parent | 7db1ff03a1faff3883d7e812929b0568c8c8b2cf (diff) | |
| download | hdf5-271208dceb7f0f81d8a2db27475ebb63a26a3562.zip hdf5-271208dceb7f0f81d8a2db27475ebb63a26a3562.tar.gz hdf5-271208dceb7f0f81d8a2db27475ebb63a26a3562.tar.bz2 | |
CMake updates:
Add build folder as Include for generated files
Add install option for copying Fortran mod files to include folder
Add PRI defines to win32defs file
Exclude mingw from extra flags
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/HDFCXXCompilerFlags.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/HDFFortranCompilerFlags.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/cacheinit.cmake | 3 | ||||
| -rw-r--r-- | config/gnu-warnings/no-developer-general | 4 |
4 files changed, 9 insertions, 2 deletions
diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake index 6836707..7bbebbc 100644 --- a/config/cmake/HDFCXXCompilerFlags.cmake +++ b/config/cmake/HDFCXXCompilerFlags.cmake @@ -85,7 +85,7 @@ if (NOT MSVC AND NOT MINGW) list (APPEND H5_CXXFLAGS0 "-Wsign-compare -Wtrigraphs -Wwrite-strings") endif() elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED + if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8) # add the general CXX flags for g++ compiler versions 4.8 and above. ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-general") diff --git a/config/cmake/HDFFortranCompilerFlags.cmake b/config/cmake/HDFFortranCompilerFlags.cmake index 15edaa8..2bbb35d 100644 --- a/config/cmake/HDFFortranCompilerFlags.cmake +++ b/config/cmake/HDFFortranCompilerFlags.cmake @@ -48,7 +48,7 @@ endif () # CDash is configured to only allow 3000 warnings, so # break into groups (from the config/gnu-flags file) #----------------------------------------------------------------------------- -if (NOT MSVC) +if (NOT MSVC AND NOT MINGW) # General flags if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel") ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/intel-warnings/ifort-general") diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake index 4846997..64e8dcc 100644 --- a/config/cmake/cacheinit.cmake +++ b/config/cmake/cacheinit.cmake @@ -23,6 +23,9 @@ set (HDF_PACKAGE_NAMESPACE "hdf5::" CACHE STRING "Name for HDF package namespace set (HDF5_BUILD_FORTRAN ON CACHE BOOL "Build FORTRAN support" FORCE) +set (HDF5_INSTALL_MOD_FORTRAN "NO" CACHE STRING "Copy FORTRAN mod files to include directory (NO SHARED STATIC)" FORCE) +set_property (CACHE HDF5_INSTALL_MOD_FORTRAN PROPERTY STRINGS NO SHARED STATIC) + set (HDF5_BUILD_GENERATORS ON CACHE BOOL "Build Test Generators" FORCE) set (HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "Enable Zlib Filters" FORCE) diff --git a/config/gnu-warnings/no-developer-general b/config/gnu-warnings/no-developer-general index 85dc0a3..18831dd 100644 --- a/config/gnu-warnings/no-developer-general +++ b/config/gnu-warnings/no-developer-general @@ -2,3 +2,7 @@ -Wno-inline -Wno-missing-format-attribute -Wno-missing-noreturn +# NOTE: -pedantic includes -Woverlength-strings which triggers a warning +# regarding the library settings string (H5libhdf5_settings). We'll turn +# it off here but leave it on in the developer flags. +-Wno-overlength-strings |