From c5a7f65679021a9378641bad9195900036cea101 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 8 Aug 2011 16:55:56 -0500 Subject: [svn-r21192] Correct Windows Fortran static builds. --- config/cmake/HDFMacros.cmake | 13 +++++++++---- 1 file 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) -- cgit v0.12