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 /hl/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 'hl/fortran/src/CMakeLists.txt')
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index 421fdff..6a40a8f 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -51,6 +51,7 @@ SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT H5_SET_LIB_OPTIONS (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_HL_F90_C_LIB_NAME} ${LIB_TYPE}) ADD_LIBRARY (${HDF5_HL_F90_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_F90_F_SRCS}) +TARGET_FORTRAN_WIN_PROPERTIES (${HDF5_HL_F90_LIB_TARGET}) IF (BUILD_SHARED_LIBS) IF (WIN32 AND NOT CYGWIN) SET_PROPERTY (TARGET ${HDF5_HL_F90_LIB_TARGET} @@ -58,11 +59,10 @@ IF (BUILD_SHARED_LIBS) BUILD_HDF5_DLL ) IF (MSVC) - SET_TARGET_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE /DLL" - ) + SET_PROPERTY (TARGET ${HDF5_HL_F90_LIB_TARGET} + APPEND PROPERTY LINK_FLAGS + "/DLL" + ) ENDIF (MSVC) ENDIF (WIN32 AND NOT CYGWIN) ENDIF (BUILD_SHARED_LIBS) |