[svn-r22105] Description:

	Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously.  The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.

Tested on:
	Mac OSX/64 10.7.3 (amazon) w/debug

1 files changed, 15 insertions, 259 deletions

diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake
index cf23846..6a1ead7 100644
--- a/config/cmake/HDFMacros.cmake
+++ b/config/cmake/HDFMacros.cmake
@@ -4,241 +4,6 @@ MACRO (SET_GLOBAL_VARIABLE name value)
 ENDMACRO (SET_GLOBAL_VARIABLE)
 
 #-------------------------------------------------------------------------------
-MACRO (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic)
-  # May need to build JPEG with PIC on x64 machines with gcc
-  # Need to use CMAKE_ANSI_CFLAGS define so that compiler test works
-
-  IF (${compress_type} MATCHES "SVN")
-    EXTERNALPROJECT_ADD (JPEG
-        SVN_REPOSITORY ${JPEG_URL}
-        # [SVN_REVISION rev] 
-        INSTALL_COMMAND ""
-        CMAKE_ARGS
-            -DBUILD_SHARED_LIBS:BOOL=OFF
-            -DJPEG_EXTERNALLY_CONFIGURED:BOOL=ON
-            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-            -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-            -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
-            -DCMAKE_ANSI_CFLAGS:STRING="${jpeg_pic}"
-    ) 
-  ELSEIF (${compress_type} MATCHES "TGZ")
-    EXTERNALPROJECT_ADD (JPEG
-        URL ${JPEG_URL}
-        URL_MD5 ""
-        INSTALL_COMMAND ""
-        CMAKE_ARGS
-            -DBUILD_SHARED_LIBS:BOOL=OFF
-            -DJPEG_EXTERNALLY_CONFIGURED:BOOL=ON
-            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-            -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-            -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
-            -DCMAKE_ANSI_CFLAGS:STRING="${jpeg_pic}"
-    ) 
-  ENDIF (${compress_type} MATCHES "SVN")
-  EXTERNALPROJECT_GET_PROPERTY (JPEG BINARY_DIR SOURCE_DIR) 
-
-  IF (${BLDTYPE} MATCHES "Debug")
-    IF (WIN32 AND NOT MINGW)
-      SET (DBG_EXT "_D")
-    ELSE (WIN32 AND NOT MINGW)
-      SET (DBG_EXT "_debug")
-    ENDIF (WIN32 AND NOT MINGW)
-  ELSE (${BLDTYPE} MATCHES "Debug")
-    SET (DBG_EXT "")
-  ENDIF (${BLDTYPE} MATCHES "Debug")
-
-  SET (JPEG_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/libjpeg${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-  SET (JPEG_INCLUDE_DIR_GEN "${BINARY_DIR}")
-  SET (JPEG_INCLUDE_DIR "${SOURCE_DIR}/src")
-  SET (JPEG_FOUND 1)
-  SET (JPEG_LIBRARIES ${JPEG_LIBRARY})
-  SET (JPEG_INCLUDE_DIRS ${JPEG_INCLUDE_DIR_GEN} ${JPEG_INCLUDE_DIR})
-ENDMACRO (EXTERNAL_JPEG_LIBRARY)
-
-#-------------------------------------------------------------------------------
-MACRO (PACKAGE_JPEG_LIBRARY compress_type)
-  ADD_CUSTOM_TARGET (JPEG-GenHeader-Copy ALL
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${JPEG_INCLUDE_DIR_GEN}/jconfig.h ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
-      COMMENT "Copying ${JPEG_INCLUDE_DIR_GEN}/jconfig.h to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
-  )
-  SET (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/jconfig.h)
-  GET_FILENAME_COMPONENT(JPEG_LIB_NAME ${JPEG_LIBRARY} NAME)
-  SET (EXTERNAL_LIBRARY_LIST ${EXTERNAL_LIBRARY_LIST} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${JPEG_LIB_NAME})
-  IF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
-    ADD_DEPENDENCIES (JPEG-GenHeader-Copy JPEG)
-  ENDIF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
-ENDMACRO (PACKAGE_JPEG_LIBRARY)
-
-#-------------------------------------------------------------------------------
-MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding)
-  IF (${compress_type} MATCHES "SVN")
-    EXTERNALPROJECT_ADD (SZIP
-        SVN_REPOSITORY ${SZIP_URL}
-        # [SVN_REVISION rev] 
-        INSTALL_COMMAND ""
-        CMAKE_ARGS
-            -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-            -DSZIP_EXTERNALLY_CONFIGURED:BOOL=ON
-            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-            -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-            -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
-            -DSZIP_ENABLE_ENCODING:BOOL=${encoding}
-    ) 
-  ELSEIF (${compress_type} MATCHES "TGZ")
-    EXTERNALPROJECT_ADD (SZIP
-        URL ${SZIP_URL}
-        URL_MD5 ""
-        INSTALL_COMMAND ""
-        CMAKE_ARGS
-            -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-            -DSZIP_EXTERNALLY_CONFIGURED:BOOL=ON
-            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-            -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-            -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
-            -DSZIP_ENABLE_ENCODING:BOOL=${encoding}
-    ) 
-  ENDIF (${compress_type} MATCHES "SVN")
-  EXTERNALPROJECT_GET_PROPERTY (SZIP BINARY_DIR SOURCE_DIR) 
-
-  IF (${BLDTYPE} MATCHES "Debug")
-    IF (WIN32 AND NOT MINGW)
-      SET (DBG_EXT "_D")
-    ELSE (WIN32 AND NOT MINGW)
-      SET (DBG_EXT "_debug")
-    ENDIF (WIN32 AND NOT MINGW)
-  ELSE (${BLDTYPE} MATCHES "Debug")
-    SET (DBG_EXT "")
-  ENDIF (${BLDTYPE} MATCHES "Debug")
-
-  IF (${libtype} MATCHES "SHARED")
-    IF (WIN32 AND NOT MINGW)
-      SET (SZIP_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}szip${DBG_EXT}${CMAKE_IMPORT_LIBRARY_SUFFIX}")
-    ELSE (WIN32 AND NOT MINGW)
-      SET (SZIP_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}szip${DBG_EXT}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-    ENDIF (WIN32 AND NOT MINGW)
-  ELSE (${libtype} MATCHES "SHARED")
-      SET (SZIP_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/libszip${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-  ENDIF (${libtype} MATCHES "SHARED")
-  SET (SZIP_INCLUDE_DIR_GEN "${BINARY_DIR}")
-  SET (SZIP_INCLUDE_DIR "${SOURCE_DIR}/src")
-  SET (SZIP_FOUND 1)
-  SET (SZIP_LIBRARIES ${SZIP_LIBRARY})
-  SET (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIR_GEN} ${SZIP_INCLUDE_DIR})
-ENDMACRO (EXTERNAL_SZIP_LIBRARY)
-
-#-------------------------------------------------------------------------------
-MACRO (PACKAGE_SZIP_LIBRARY compress_type libtype)
-  ADD_CUSTOM_TARGET (SZIP-GenHeader-Copy ALL
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SZIP_INCLUDE_DIR_GEN}/SZconfig.h ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
-      COMMENT "Copying ${SZIP_INCLUDE_DIR_GEN}/SZconfig.h to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
-  )
-  SET (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/SZconfig.h)
-  GET_FILENAME_COMPONENT(SZIP_LIB_NAME ${SZIP_LIBRARY} NAME)
-  SET (EXTERNAL_LIBRARY_LIST ${EXTERNAL_LIBRARY_LIST} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SZIP_LIB_NAME})
-  IF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
-    ADD_DEPENDENCIES (SZIP-GenHeader-Copy SZIP)
-  ENDIF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
-  IF (WIN32 AND NOT CYGWIN)
-    IF (${libtype} MATCHES "SHARED")
-      GET_FILENAME_COMPONENT(SZIP_DLL_NAME ${SZIP_LIBRARY} NAME_WE)
-      SET (EXTERNAL_LIBRARYDLL_LIST ${EXTERNAL_LIBRARYDLL_LIST} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SZIP_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
-    ENDIF (${libtype} MATCHES "SHARED")
-  ENDIF (WIN32 AND NOT CYGWIN)
-ENDMACRO (PACKAGE_SZIP_LIBRARY)
-
-#-------------------------------------------------------------------------------
-MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype)
-  IF (${compress_type} MATCHES "SVN")
-    EXTERNALPROJECT_ADD (ZLIB
-        SVN_REPOSITORY ${ZLIB_URL}
-        # [SVN_REVISION rev] 
-        INSTALL_COMMAND ""
-        CMAKE_ARGS
-            -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-            -DZLIB_EXTERNALLY_CONFIGURED:BOOL=ON
-            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-            -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-            -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
-            -DHDF_LEGACY_NAMING:BOOL=${HDF_LEGACY_NAMING}
-    ) 
-  ELSEIF (${compress_type} MATCHES "TGZ")
-    EXTERNALPROJECT_ADD (ZLIB
-        URL ${ZLIB_URL}
-        URL_MD5 ""
-        INSTALL_COMMAND ""
-        CMAKE_ARGS
-            -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-            -DZLIB_EXTERNALLY_CONFIGURED:BOOL=ON
-            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-            -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-            -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
-            -DHDF_LEGACY_NAMING:BOOL=${HDF_LEGACY_NAMING}
-    ) 
-  ENDIF (${compress_type} MATCHES "SVN")
-  EXTERNALPROJECT_GET_PROPERTY (ZLIB BINARY_DIR SOURCE_DIR) 
-
-  IF (${BLDTYPE} MATCHES "Debug")
-    IF (WIN32 AND NOT MINGW)
-      SET (DBG_EXT "_D")
-    ELSE (WIN32 AND NOT MINGW)
-      SET (DBG_EXT "_debug")
-    ENDIF (WIN32 AND NOT MINGW)
-  ELSE (${BLDTYPE} MATCHES "Debug")
-    SET (DBG_EXT "")
-  ENDIF (${BLDTYPE} MATCHES "Debug")
-  
-  IF (${libtype} MATCHES "SHARED")
-    IF (WIN32 AND NOT MINGW)
-      SET (ZLIB_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}zlib1${DBG_EXT}${CMAKE_IMPORT_LIBRARY_SUFFIX}")
-    ELSE (WIN32 AND NOT MINGW)
-      SET (ZLIB_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}z${DBG_EXT}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-    ENDIF (WIN32 AND NOT MINGW)
-  ELSE (${libtype} MATCHES "SHARED")
-    IF (WIN32 AND NOT MINGW)
-      IF (HDF_LEGACY_NAMING)
-        SET (ZLIB_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/zlib${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-      ELSE (HDF_LEGACY_NAMING)
-        SET (ZLIB_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/libzlib${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-      ENDIF (HDF_LEGACY_NAMING)
-    ELSE (WIN32 AND NOT MINGW)
-      SET (ZLIB_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/libz${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-    ENDIF (WIN32 AND NOT MINGW)
-  ENDIF (${libtype} MATCHES "SHARED")
-  
-  SET (ZLIB_INCLUDE_DIR_GEN "${BINARY_DIR}")
-  SET (ZLIB_INCLUDE_DIR "${SOURCE_DIR}/src")
-  SET (ZLIB_FOUND 1)
-  SET (ZLIB_LIBRARIES ${ZLIB_LIBRARY})
-  SET (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR_GEN} ${ZLIB_INCLUDE_DIR})
-ENDMACRO (EXTERNAL_ZLIB_LIBRARY)
-
-#-------------------------------------------------------------------------------
-MACRO (PACKAGE_ZLIB_LIBRARY compress_type libtype)
-  ADD_CUSTOM_TARGET (ZLIB-GenHeader-Copy ALL
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZLIB_INCLUDE_DIR_GEN}/zconf.h ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
-      COMMENT "Copying ${ZLIB_INCLUDE_DIR_GEN}/zconf.h to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
-  )
-  SET (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/zconf.h)
-  GET_FILENAME_COMPONENT(ZLIB_LIB_NAME ${ZLIB_LIBRARY} NAME)
-  SET (EXTERNAL_LIBRARY_LIST ${EXTERNAL_LIBRARY_LIST} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${ZLIB_LIB_NAME})
-  IF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
-    ADD_DEPENDENCIES (ZLIB-GenHeader-Copy ZLIB)
-  ENDIF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
-  IF (WIN32 AND NOT CYGWIN)
-    IF (${libtype} MATCHES "SHARED")
-      GET_FILENAME_COMPONENT(ZLIB_DLL_NAME ${ZLIB_LIBRARY} NAME_WE)
-      SET (EXTERNAL_LIBRARYDLL_LIST ${EXTERNAL_LIBRARYDLL_LIST} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${ZLIB_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
-    ENDIF (${libtype} MATCHES "SHARED")
-  ENDIF (WIN32 AND NOT CYGWIN)
-ENDMACRO (PACKAGE_ZLIB_LIBRARY)
-
-#-------------------------------------------------------------------------------
 MACRO (IDE_GENERATED_PROPERTIES SOURCE_PATH HEADERS SOURCES)
   #set(source_group_path "Source/AIM/${NAME}")
   STRING (REPLACE "/" "\\\\" source_group_path ${SOURCE_PATH})
@@ -272,12 +37,7 @@ ENDMACRO (IDE_SOURCE_PROPERTIES)
 MACRO (TARGET_NAMING target libtype)
   IF (WIN32 AND NOT MINGW)
     IF (${libtype} MATCHES "SHARED")
-      IF (HDF_LEGACY_NAMING)
-        SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "dll")
-        SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "${target}")
-      ELSE (HDF_LEGACY_NAMING)
-        SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "${target}dll")
-      ENDIF (HDF_LEGACY_NAMING)
+      SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "${target}dll")
     ENDIF (${libtype} MATCHES "SHARED")
   ENDIF (WIN32 AND NOT MINGW)
 ENDMACRO (TARGET_NAMING)
@@ -287,26 +47,16 @@ MACRO (HDF_SET_LIB_OPTIONS libtarget libname libtype)
   # message (STATUS "${libname} libtype: ${libtype}")
   IF (${libtype} MATCHES "SHARED")
     IF (WIN32 AND NOT MINGW)
-      IF (HDF_LEGACY_NAMING)
-        SET (LIB_RELEASE_NAME "${libname}dll")
-        SET (LIB_DEBUG_NAME "${libname}ddll")
-      ELSE (HDF_LEGACY_NAMING)
-        SET (LIB_RELEASE_NAME "${libname}")
-        SET (LIB_DEBUG_NAME "${libname}_D")
-      ENDIF (HDF_LEGACY_NAMING)
+      SET (LIB_RELEASE_NAME "${libname}")
+      SET (LIB_DEBUG_NAME "${libname}_D")
     ELSE (WIN32 AND NOT MINGW)
       SET (LIB_RELEASE_NAME "${libname}")
       SET (LIB_DEBUG_NAME "${libname}_debug")
     ENDIF (WIN32 AND NOT MINGW)
   ELSE (${libtype} MATCHES "SHARED")
     IF (WIN32 AND NOT MINGW)
-      IF (HDF_LEGACY_NAMING)
-        SET (LIB_RELEASE_NAME "${libname}")
-        SET (LIB_DEBUG_NAME "${libname}d")
-      ELSE (HDF_LEGACY_NAMING)
-        SET (LIB_RELEASE_NAME "lib${libname}")
-        SET (LIB_DEBUG_NAME "lib${libname}_D")
-      ENDIF (HDF_LEGACY_NAMING)
+      SET (LIB_RELEASE_NAME "lib${libname}")
+      SET (LIB_DEBUG_NAME "lib${libname}_D")
     ELSE (WIN32 AND NOT MINGW)
       # if the generator supports configuration types or if the CMAKE_BUILD_TYPE has a value
       IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
@@ -341,13 +91,19 @@ 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
+              COMPILE_FLAGS "/MD"
+              LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}"
+      ) 
+    ENDIF (BUILD_SHARED_LIBS)
+  ENDIF (WIN32 AND MSVC)
 ENDMACRO (TARGET_FORTRAN_WIN_PROPERTIES)