diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-01-08 18:57:33 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-01-08 18:57:33 (GMT) |
| commit | ca327ba1c42c1cab1b0b38bde76a1baaec73407f (patch) | |
| tree | c1b39329442c713175374ef209a0ca5f9f0657e4 /config | |
| parent | 6d3231b9cd6593cc25575ebc586f0a9521e0aea4 (diff) | |
| parent | 58a475d3fabba89a9fed2a22d3f0851c9933f650 (diff) | |
| download | hdf5-ca327ba1c42c1cab1b0b38bde76a1baaec73407f.zip hdf5-ca327ba1c42c1cab1b0b38bde76a1baaec73407f.tar.gz hdf5-ca327ba1c42c1cab1b0b38bde76a1baaec73407f.tar.bz2 | |
Merge pull request #848 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '58a475d3fabba89a9fed2a22d3f0851c9933f650':
Fix link_libs and static CRT fortran
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake_ext_mod/HDFUseFortran.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/cmake_ext_mod/HDFUseFortran.cmake b/config/cmake_ext_mod/HDFUseFortran.cmake index 7bf4d81..5be2c49 100644 --- a/config/cmake_ext_mod/HDFUseFortran.cmake +++ b/config/cmake_ext_mod/HDFUseFortran.cmake @@ -15,6 +15,14 @@ #------------------------------------------------------------------------------- ENABLE_LANGUAGE (Fortran) +#------------------------------------------------------------------------------- +# Fix Fortran flags if we are compiling staticly on Windows using +# Windows_MT.cmake from config/cmake/UserMacros +#------------------------------------------------------------------------------- +if (BUILD_STATIC_CRT_LIBS) + TARGET_STATIC_CRT_FLAGS () +endif () + #----------------------------------------------------------------------------- # Detect name mangling convention used between Fortran and C #----------------------------------------------------------------------------- |