diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-01-05 15:04:35 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-01-05 15:04:35 (GMT) |
| commit | 4b3bdd519c02476e98d484f4af873e577fc25604 (patch) | |
| tree | d550f8327609109b8a4754859389cb7b669048bb /hl/fortran/src | |
| parent | 865cc514351c7088e5b5b7dfcbedb7c58e147c1b (diff) | |
| download | hdf5-4b3bdd519c02476e98d484f4af873e577fc25604.zip hdf5-4b3bdd519c02476e98d484f4af873e577fc25604.tar.gz hdf5-4b3bdd519c02476e98d484f4af873e577fc25604.tar.bz2 | |
[svn-r19911] Change how LINK_FLAGS for fortran are appended on Windows - correct for just shared libs
bring r19910 from trunk
Diffstat (limited to 'hl/fortran/src')
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index 77b73d2..fecfc15 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -51,13 +51,16 @@ 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} "/DLL") +SET (SHARED_LINK_FLAGS "") IF (BUILD_SHARED_LIBS) IF (WIN32 AND NOT CYGWIN) SET_PROPERTY (TARGET ${HDF5_HL_F90_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS BUILD_HDF5_DLL ) + IF (MSVC) + SET (SHARED_LINK_FLAGS "/DLL") + ENDIF (MSVC) ENDIF (WIN32 AND NOT CYGWIN) ENDIF (BUILD_SHARED_LIBS) IF (WIN32 AND NOT CYGWIN) @@ -66,6 +69,7 @@ IF (WIN32 AND NOT CYGWIN) HDF5F90_WINDOWS ) ENDIF (WIN32 AND NOT CYGWIN) +TARGET_FORTRAN_WIN_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} ${SHARED_LINK_FLAGS}) SET_TARGET_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} PROPERTIES LINKER_LANGUAGE Fortran) TARGET_LINK_LIBRARIES (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_C_LIB_TARGET} |