summaryrefslogtreecommitdiffstats
path: root/config/cmake/HDFLibMacros.cmake
diff options
context:
space:
mode:
Diffstat (limited to 'config/cmake/HDFLibMacros.cmake')
-rw-r--r--config/cmake/HDFLibMacros.cmake24
1 files changed, 12 insertions, 12 deletions
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