diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-01-04 18:40:26 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-01-04 18:40:26 (GMT) |
| commit | 9449cfa3615eadb40d554a1148ca020ac1b0f632 (patch) | |
| tree | ed9f5207644fcc9ae8b3a828bf104706e1580436 /fortran/src/CMakeLists.txt | |
| parent | 1c7688c77afe630fc6382f994671ff3d5220279a (diff) | |
| download | hdf5-9449cfa3615eadb40d554a1148ca020ac1b0f632.zip hdf5-9449cfa3615eadb40d554a1148ca020ac1b0f632.tar.gz hdf5-9449cfa3615eadb40d554a1148ca020ac1b0f632.tar.bz2 | |
[svn-r19907] Windows: Correct how fortran links in CRT library. Also correct macro use for checking libtype.
bring r19906 from 1.8 branch
Diffstat (limited to 'fortran/src/CMakeLists.txt')
| -rw-r--r-- | fortran/src/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index 2af57c1..8ad5000 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -184,6 +184,7 @@ ENDIF (H5_HAVE_PARALLEL) # Add Main fortran library #----------------------------------------------------------------------------- ADD_LIBRARY (${HDF5_F90_LIB_TARGET} ${LIB_TYPE} ${f90_F_SRCS}) +TARGET_FORTRAN_WIN_PROPERTIES (${HDF5_F90_LIB_TARGET}) IF (WIN32 AND NOT CYGWIN) IF (BUILD_SHARED_LIBS) SET_PROPERTY (TARGET ${HDF5_F90_LIB_TARGET} @@ -191,10 +192,9 @@ IF (WIN32 AND NOT CYGWIN) BUILD_HDF5_DLL ) IF (MSVC) - SET_TARGET_PROPERTIES (${HDF5_F90_LIB_TARGET} - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE /DLL /DEF:${HDF5_F90_SRC_SOURCE_DIR}/hdf5_fortrandll.def" + SET_PROPERTY (TARGET ${HDF5_F90_LIB_TARGET} + APPEND PROPERTY LINK_FLAGS + "/DLL /DEF:${HDF5_F90_SRC_SOURCE_DIR}/hdf5_fortrandll.def" ) ENDIF (MSVC) ENDIF (BUILD_SHARED_LIBS) |