diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-01-08 18:57:11 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-01-08 18:57:11 (GMT) |
| commit | 7bd06dccb543a35763a967e3f84f3c8d89f0c538 (patch) | |
| tree | b8bf6720d47466edaaf460733b88d7b5c5f57900 /config | |
| parent | c9e0dc95335b07724ae20b5f84c37f1350f3ec5c (diff) | |
| parent | 531f4d839d92f3991fed30b1587eddabb949a2b0 (diff) | |
| download | hdf5-7bd06dccb543a35763a967e3f84f3c8d89f0c538.zip hdf5-7bd06dccb543a35763a967e3f84f3c8d89f0c538.tar.gz hdf5-7bd06dccb543a35763a967e3f84f3c8d89f0c538.tar.bz2 | |
Merge pull request #849 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_8 to hdf5_1_8
* commit '531f4d839d92f3991fed30b1587eddabb949a2b0':
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 #----------------------------------------------------------------------------- |