summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-08-08 21:55:56 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-08-08 21:55:56 (GMT)
commitc5a7f65679021a9378641bad9195900036cea101 (patch)
tree093971e9d5bc8e3ac1ccea63499bf914b60a44fe
parent1144d0521d2c8c6708ae4cbb1bd920905ccf0e56 (diff)
downloadhdf5-c5a7f65679021a9378641bad9195900036cea101.zip
hdf5-c5a7f65679021a9378641bad9195900036cea101.tar.gz
hdf5-c5a7f65679021a9378641bad9195900036cea101.tar.bz2
[svn-r21192] Correct Windows Fortran static builds.
-rw-r--r--config/cmake/HDFMacros.cmake13
1 files changed, 9 insertions, 4 deletions
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake
index 28f9eba..d0206ad 100644
--- a/config/cmake/HDFMacros.cmake
+++ b/config/cmake/HDFMacros.cmake
@@ -389,13 +389,18 @@ ENDMACRO (HDF_SET_LIB_OPTIONS)
#-------------------------------------------------------------------------------
MACRO (TARGET_FORTRAN_WIN_PROPERTIES target addlinkflags)
- IF (WIN32)
- IF (MSVC)
+ IF (WIN32 AND MSVC)
+ IF (BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES (${target}
PROPERTIES
COMPILE_FLAGS "/dll"
LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}"
)
- ENDIF (MSVC)
- ENDIF (WIN32)
+ ELSE (BUILD_SHARED_LIBS)
+ SET_TARGET_PROPERTIES (${target}
+ PROPERTIES
+ LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}"
+ )
+ ENDIF (BUILD_SHARED_LIBS)
+ ENDIF (WIN32 AND MSVC)
ENDMACRO (TARGET_FORTRAN_WIN_PROPERTIES)