From 45a0d7e3f4d7ad2001e5699faf59a5f5a9843b32 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 29 Mar 2012 12:51:56 -0500
Subject: [svn-r22190] Update MINGW configuration

---
 config/cmake/HDFMacros.cmake | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake
index 6a1ead7..0d3ab5f 100644
--- a/config/cmake/HDFMacros.cmake
+++ b/config/cmake/HDFMacros.cmake
@@ -35,29 +35,29 @@ ENDMACRO (IDE_SOURCE_PROPERTIES)
 
 #-------------------------------------------------------------------------------
 MACRO (TARGET_NAMING target libtype)
-  IF (WIN32 AND NOT MINGW)
+  IF (WIN32)
     IF (${libtype} MATCHES "SHARED")
       SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "${target}dll")
     ENDIF (${libtype} MATCHES "SHARED")
-  ENDIF (WIN32 AND NOT MINGW)
+  ENDIF (WIN32)
 ENDMACRO (TARGET_NAMING)
 
 #-------------------------------------------------------------------------------
 MACRO (HDF_SET_LIB_OPTIONS libtarget libname libtype)
   # message (STATUS "${libname} libtype: ${libtype}")
   IF (${libtype} MATCHES "SHARED")
-    IF (WIN32 AND NOT MINGW)
+    IF (WIN32)
       SET (LIB_RELEASE_NAME "${libname}")
       SET (LIB_DEBUG_NAME "${libname}_D")
-    ELSE (WIN32 AND NOT MINGW)
+    ELSE (WIN32)
       SET (LIB_RELEASE_NAME "${libname}")
       SET (LIB_DEBUG_NAME "${libname}_debug")
-    ENDIF (WIN32 AND NOT MINGW)
+    ENDIF (WIN32)
   ELSE (${libtype} MATCHES "SHARED")
-    IF (WIN32 AND NOT MINGW)
+    IF (WIN32)
       SET (LIB_RELEASE_NAME "lib${libname}")
       SET (LIB_DEBUG_NAME "lib${libname}_D")
-    ELSE (WIN32 AND NOT MINGW)
+    ELSE (WIN32)
       # if the generator supports configuration types or if the CMAKE_BUILD_TYPE has a value
       IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
         SET (LIB_RELEASE_NAME "${libname}")
@@ -66,7 +66,7 @@ MACRO (HDF_SET_LIB_OPTIONS libtarget libname libtype)
         SET (LIB_RELEASE_NAME "lib${libname}")
         SET (LIB_DEBUG_NAME "lib${libname}_debug")
       ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-    ENDIF (WIN32 AND NOT MINGW)
+    ENDIF (WIN32)
   ENDIF (${libtype} MATCHES "SHARED")
   
   SET_TARGET_PROPERTIES (${libtarget}
-- 
cgit v0.12