From f1efcf9d7a931460fd2a297139a7828bedf8a999 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 5 Dec 2011 13:45:29 -0500 Subject: [svn-r21811] CMAKE_BUILD_TYPE compares to "Debug" not "DEBUG" --- config/cmake/HDFLibMacros.cmake | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/config/cmake/HDFLibMacros.cmake b/config/cmake/HDFLibMacros.cmake index 99bc13e..f9f4d55 100644 --- a/config/cmake/HDFLibMacros.cmake +++ b/config/cmake/HDFLibMacros.cmake @@ -36,15 +36,15 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic) ENDIF (${compress_type} MATCHES "SVN") EXTERNALPROJECT_GET_PROPERTY (JPEG BINARY_DIR SOURCE_DIR) - IF (${CMAKE_BUILD_TYPE} MATCHES "DEBUG") + IF (${CMAKE_BUILD_TYPE} MATCHES "Debug") IF (WIN32 AND NOT MINGW) SET (JPEG_LIB_NAME "jpeg_D") ELSE (WIN32 AND NOT MINGW) SET (JPEG_LIB_NAME "jpeg_debug") ENDIF (WIN32 AND NOT MINGW) - ELSE (${CMAKE_BUILD_TYPE} MATCHES "DEBUG") + ELSE (${CMAKE_BUILD_TYPE} MATCHES "Debug") SET (JPEG_LIB_NAME "jpeg") - ENDIF (${CMAKE_BUILD_TYPE} MATCHES "DEBUG") + ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug") # Create imported target szip ADD_LIBRARY(jpeg STATIC IMPORTED) @@ -136,15 +136,15 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding) ENDIF (${compress_type} MATCHES "SVN") EXTERNALPROJECT_GET_PROPERTY (SZIP BINARY_DIR SOURCE_DIR) - IF (${CMAKE_BUILD_TYPE} MATCHES "DEBUG") + IF (${CMAKE_BUILD_TYPE} MATCHES "Debug") IF (WIN32 AND NOT MINGW) SET (SZIP_LIB_NAME "szip_D") ELSE (WIN32 AND NOT MINGW) SET (SZIP_LIB_NAME "szip_debug") ENDIF (WIN32 AND NOT MINGW) - ELSE (${CMAKE_BUILD_TYPE} MATCHES "DEBUG") + ELSE (${CMAKE_BUILD_TYPE} MATCHES "Debug") SET (SZIP_LIB_NAME "szip") - ENDIF (${CMAKE_BUILD_TYPE} MATCHES "DEBUG") + ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug") # Create imported target szip ADD_LIBRARY(szip ${libtype} IMPORTED) @@ -234,19 +234,19 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype) ENDIF (${compress_type} MATCHES "SVN") EXTERNALPROJECT_GET_PROPERTY (ZLIB BINARY_DIR SOURCE_DIR) - IF (${CMAKE_BUILD_TYPE} MATCHES "DEBUG") + IF (${CMAKE_BUILD_TYPE} MATCHES "Debug") IF (WIN32 AND NOT MINGW) SET (ZLIB_LIB_NAME "zlib_D") ELSE (WIN32 AND NOT MINGW) SET (ZLIB_LIB_NAME "z_debug") ENDIF (WIN32 AND NOT MINGW) - ELSE (${CMAKE_BUILD_TYPE} MATCHES "DEBUG") + ELSE (${CMAKE_BUILD_TYPE} MATCHES "Debug") IF (WIN32 AND NOT MINGW) SET (ZLIB_LIB_NAME "zlib") ELSE (WIN32 AND NOT MINGW) SET (ZLIB_LIB_NAME "z") ENDIF (WIN32 AND NOT MINGW) - ENDIF (${CMAKE_BUILD_TYPE} MATCHES "DEBUG") + ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug") # Create imported target szip ADD_LIBRARY(zlib ${libtype} IMPORTED) -- cgit v0.12