mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-27 02:10:55 +08:00
[svn-r22182] Update MINGW configuration
This commit is contained in:
parent
7ffa2b1bea
commit
f05aa59a26
@ -51,12 +51,19 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type libtype jpeg_pic)
|
||||
ADD_DEPENDENCIES (jpeg JPEG)
|
||||
|
||||
IF (${libtype} MATCHES "SHARED")
|
||||
IF (WIN32 AND NOT MINGW)
|
||||
SET_TARGET_PROPERTIES(jpeg PROPERTIES
|
||||
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${JPEG_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
|
||||
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${JPEG_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
||||
)
|
||||
ELSE (WIN32 AND NOT MINGW)
|
||||
IF (WIN32)
|
||||
IF (MINGW)
|
||||
SET_TARGET_PROPERTIES(jpeg PROPERTIES
|
||||
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${JPEG_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
||||
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${JPEG_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
||||
)
|
||||
ELSE (MINGW)
|
||||
SET_TARGET_PROPERTIES(jpeg PROPERTIES
|
||||
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${JPEG_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
|
||||
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${JPEG_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
||||
)
|
||||
ENDIF (MINGW)
|
||||
ELSE (WIN32)
|
||||
IF (CYGWIN)
|
||||
SET_TARGET_PROPERTIES(jpeg PROPERTIES
|
||||
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_IMPORT_LIBRARY_PREFIX}${JPEG_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
|
||||
@ -69,7 +76,7 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type libtype jpeg_pic)
|
||||
SOVERSION "${JPEG_VERSION_STRING}"
|
||||
)
|
||||
ENDIF (CYGWIN)
|
||||
ENDIF (WIN32 AND NOT MINGW)
|
||||
ENDIF (WIN32)
|
||||
ELSE (${libtype} MATCHES "SHARED")
|
||||
IF (WIN32 AND NOT MINGW)
|
||||
SET_TARGET_PROPERTIES(jpeg PROPERTIES
|
||||
@ -158,12 +165,19 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding)
|
||||
ADD_DEPENDENCIES (szip SZIP)
|
||||
|
||||
IF (${libtype} MATCHES "SHARED")
|
||||
IF (WIN32 AND NOT MINGW)
|
||||
SET_TARGET_PROPERTIES(szip PROPERTIES
|
||||
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${SZIP_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
|
||||
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${SZIP_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
||||
)
|
||||
ELSE (WIN32 AND NOT MINGW)
|
||||
IF (WIN32)
|
||||
IF (MINGW)
|
||||
SET_TARGET_PROPERTIES(jpeg PROPERTIES
|
||||
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${SZIP_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
||||
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${SZIP_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
||||
)
|
||||
ELSE (MINGW)
|
||||
SET_TARGET_PROPERTIES(szip PROPERTIES
|
||||
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${SZIP_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
|
||||
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${SZIP_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
||||
)
|
||||
ENDIF (MINGW)
|
||||
ELSE (WIN32)
|
||||
IF (CYGWIN)
|
||||
SET_TARGET_PROPERTIES(szip PROPERTIES
|
||||
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_IMPORT_LIBRARY_PREFIX}${SZIP_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
|
||||
@ -176,7 +190,7 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding)
|
||||
SOVERSION "${SZIP_VERSION_STRING}"
|
||||
)
|
||||
ENDIF (CYGWIN)
|
||||
ENDIF (WIN32 AND NOT MINGW)
|
||||
ENDIF (WIN32)
|
||||
ELSE (${libtype} MATCHES "SHARED")
|
||||
IF (WIN32 AND NOT MINGW)
|
||||
SET_TARGET_PROPERTIES(szip PROPERTIES
|
||||
@ -267,12 +281,19 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype)
|
||||
ADD_DEPENDENCIES (zlib ZLIB)
|
||||
|
||||
IF (${libtype} MATCHES "SHARED")
|
||||
IF (WIN32 AND NOT MINGW)
|
||||
SET_TARGET_PROPERTIES(zlib PROPERTIES
|
||||
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
|
||||
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
||||
)
|
||||
ELSE (WIN32 AND NOT MINGW)
|
||||
IF (WIN32)
|
||||
IF (MINGW)
|
||||
SET_TARGET_PROPERTIES(jpeg PROPERTIES
|
||||
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
||||
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
||||
)
|
||||
ELSE (MINGW)
|
||||
SET_TARGET_PROPERTIES(zlib PROPERTIES
|
||||
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
|
||||
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BLDTYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
||||
)
|
||||
ENDIF (MINGW)
|
||||
ELSE (WIN32)
|
||||
IF (CYGWIN)
|
||||
SET_TARGET_PROPERTIES(zlib PROPERTIES
|
||||
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_IMPORT_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
|
||||
@ -285,7 +306,7 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype)
|
||||
SOVERSION "${ZLIB_VERSION_STRING}"
|
||||
)
|
||||
ENDIF (CYGWIN)
|
||||
ENDIF (WIN32 AND NOT MINGW)
|
||||
ENDIF (WIN32)
|
||||
ELSE (${libtype} MATCHES "SHARED")
|
||||
IF (WIN32 AND NOT MINGW)
|
||||
SET_TARGET_PROPERTIES(zlib PROPERTIES
|
||||
|
Loading…
Reference in New Issue
Block a user