[svn-r22198] Update MINGW configuration (MinGW is Windows except for some issues)

2 files changed, 19 insertions, 19 deletions

diff --git a/config/cmake/FindSZIP.cmake b/config/cmake/FindSZIP.cmake
index 6118f7a..05d42cf 100644
--- a/config/cmake/FindSZIP.cmake
+++ b/config/cmake/FindSZIP.cmake
@@ -44,11 +44,11 @@ MACRO (SZIP_ADJUST_LIB_VARS basename)
       # if the generator supports configuration types then set
       # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
       IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-	SET (${basename}_LIBRARY       optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG})
+    SET (${basename}_LIBRARY       optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG})
       ELSE(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-	# if there are no configuration types and CMAKE_BUILD_TYPE has no value
-	# then just use the release libraries
-	SET (${basename}_LIBRARY       ${${basename}_LIBRARY_RELEASE} )
+    # if there are no configuration types and CMAKE_BUILD_TYPE has no value
+    # then just use the release libraries
+    SET (${basename}_LIBRARY       ${${basename}_LIBRARY_RELEASE} )
       ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
       SET (${basename}_LIBRARIES       optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG})
     ENDIF (${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE)
@@ -90,13 +90,13 @@ FIND_PATH (SZIP_INCLUDE_DIR
     NO_DEFAULT_PATH
 )
 
-IF (WIN32 AND NOT MINGW)
+IF (WIN32W)
     SET (SZIP_SEARCH_DEBUG_NAMES "sz_d;libsz_d")
     SET (SZIP_SEARCH_RELEASE_NAMES "sz;libsz")
-ELSE (WIN32 AND NOT MINGW)
+ELSE (WIN32)
     SET (SZIP_SEARCH_DEBUG_NAMES "sz_d")
     SET (SZIP_SEARCH_RELEASE_NAMES "sz")
-ENDIF (WIN32 AND NOT MINGW)
+ENDIF (WIN32)
 
 # Look for the library.
 FIND_LIBRARY (SZIP_LIBRARY_DEBUG
diff --git a/config/cmake/HDFLibMacros.cmake b/config/cmake/HDFLibMacros.cmake
index dcf911b..b9c1fbb 100644
--- a/config/cmake/HDFLibMacros.cmake
+++ b/config/cmake/HDFLibMacros.cmake
@@ -37,11 +37,11 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type libtype jpeg_pic)
   EXTERNALPROJECT_GET_PROPERTY (JPEG BINARY_DIR SOURCE_DIR) 
 
   IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
-    IF (WIN32 AND NOT MINGW)
+    IF (WIN32)
       SET (JPEG_LIB_NAME "jpeg_D")
-    ELSE (WIN32 AND NOT MINGW)
+    ELSE (WIN32)
       SET (JPEG_LIB_NAME "jpeg_debug")
-    ENDIF (WIN32 AND NOT MINGW)
+    ENDIF (WIN32)
   ELSE (${CMAKE_BUILD_TYPE} MATCHES "Debug")
     SET (JPEG_LIB_NAME "jpeg")
   ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
@@ -151,11 +151,11 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding)
   EXTERNALPROJECT_GET_PROPERTY (SZIP BINARY_DIR SOURCE_DIR) 
 
   IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
-    IF (WIN32 AND NOT MINGW)
+    IF (WIN32)
       SET (SZIP_LIB_NAME "szip_D")
-    ELSE (WIN32 AND NOT MINGW)
+    ELSE (WIN32)
       SET (SZIP_LIB_NAME "szip_debug")
-    ENDIF (WIN32 AND NOT MINGW)
+    ENDIF (WIN32)
   ELSE (${CMAKE_BUILD_TYPE} MATCHES "Debug")
     SET (SZIP_LIB_NAME "szip")
   ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
@@ -263,17 +263,17 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype)
   EXTERNALPROJECT_GET_PROPERTY (ZLIB BINARY_DIR SOURCE_DIR) 
 
   IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
-    IF (WIN32 AND NOT MINGW)
+    IF (WIN32)
       SET (ZLIB_LIB_NAME "zlib_D")
-    ELSE (WIN32 AND NOT MINGW)
+    ELSE (WIN32)
       SET (ZLIB_LIB_NAME "z_debug")
-    ENDIF (WIN32 AND NOT MINGW)
+    ENDIF (WIN32)
   ELSE (${CMAKE_BUILD_TYPE} MATCHES "Debug")
-    IF (WIN32 AND NOT MINGW)
+    IF (WIN32)
       SET (ZLIB_LIB_NAME "zlib")
-    ELSE (WIN32 AND NOT MINGW)
+    ELSE (WIN32)
       SET (ZLIB_LIB_NAME "z")
-    ENDIF (WIN32 AND NOT MINGW)
+    ENDIF (WIN32)
   ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
 
   # Create imported target szip