[svn-r21813] CMAKE_BUILD_TYPE compares to "Debug" not "DEBUG"

This commit is contained in:
Allen Byrne 2011-12-05 15:25:18 -05:00
parent 478b173358
commit b6c3da9733

View File

@ -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)