diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-04-12 19:30:31 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-04-12 19:30:31 (GMT) |
| commit | 1285f6734c5916ce54104e05163b4114655d7954 (patch) | |
| tree | 448b731955439995f169e45e493a3b1e9bd462fb | |
| parent | 60abcfd2e85c005266afb82f755f773808203c6c (diff) | |
| download | hdf5-1285f6734c5916ce54104e05163b4114655d7954.zip hdf5-1285f6734c5916ce54104e05163b4114655d7954.tar.gz hdf5-1285f6734c5916ce54104e05163b4114655d7954.tar.bz2 | |
[svn-r20486] Fix handling of ext libs Windows naming for External_Project builds of "Debug" builds.
| -rw-r--r-- | config/cmake/HDFMacros.cmake | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake index be32066..3b7ec43 100644 --- a/config/cmake/HDFMacros.cmake +++ b/config/cmake/HDFMacros.cmake @@ -19,7 +19,6 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic) -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY} -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} - -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_ANSI_CFLAGS:STRING="${jpeg_pic}" ) ELSEIF (${compress_type} MATCHES "TGZ") @@ -33,13 +32,22 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic) -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY} -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} - -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_ANSI_CFLAGS:STRING="${jpeg_pic}" ) ENDIF (${compress_type} MATCHES "SVN") EXTERNALPROJECT_GET_PROPERTY (JPEG BINARY_DIR SOURCE_DIR) - SET (JPEG_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/libjpeg${CMAKE_STATIC_LIBRARY_SUFFIX}") + IF (${BLDTYPE} MATCHES "Debug") + IF (WIN32 AND NOT MINGW) + SET (DBG_EXT "_D") + ELSE (WIN32 AND NOT MINGW) + SET (DBG_EXT "_debug") + ENDIF (WIN32 AND NOT MINGW) + ELSE (${BLDTYPE} MATCHES "Debug") + SET (DBG_EXT "") + ENDIF (${BLDTYPE} MATCHES "Debug") + + SET (JPEG_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/libjpeg${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}") SET (JPEG_INCLUDE_DIR_GEN "${BINARY_DIR}") SET (JPEG_INCLUDE_DIR "${SOURCE_DIR}/src") SET (JPEG_FOUND 1) @@ -94,11 +102,7 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding) IF (${BLDTYPE} MATCHES "Debug") IF (WIN32 AND NOT MINGW) - IF (HDF_LEGACY_NAMING) - SET (DBG_EXT "d") - ELSE (HDF_LEGACY_NAMING) - SET (DBG_EXT "_D") - ENDIF (HDF_LEGACY_NAMING) + SET (DBG_EXT "_D") ELSE (WIN32 AND NOT MINGW) SET (DBG_EXT "_debug") ENDIF (WIN32 AND NOT MINGW) @@ -175,11 +179,7 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype) IF (${BLDTYPE} MATCHES "Debug") IF (WIN32 AND NOT MINGW) - IF (HDF_LEGACY_NAMING) - SET (DBG_EXT "d") - ELSE (HDF_LEGACY_NAMING) - SET (DBG_EXT "_D") - ENDIF (HDF_LEGACY_NAMING) + SET (DBG_EXT "_D") ELSE (WIN32 AND NOT MINGW) SET (DBG_EXT "_debug") ENDIF (WIN32 AND NOT MINGW) |