diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2012-03-29 15:59:34 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2012-03-29 15:59:34 (GMT) |
| commit | 7d347f2afd39ea05ae775151d628276b01cb6dad (patch) | |
| tree | 3c6677e817325c4da0874bc7c9b8d1e45b66bb65 | |
| parent | 455c1256853698d83e12228c3967e981c3e8db75 (diff) | |
| download | hdf5-7d347f2afd39ea05ae775151d628276b01cb6dad.zip hdf5-7d347f2afd39ea05ae775151d628276b01cb6dad.tar.gz hdf5-7d347f2afd39ea05ae775151d628276b01cb6dad.tar.bz2 | |
[svn-r22185] Update MINGW configuration to match HDFMacros settings for shared library
| -rw-r--r-- | config/cmake/HDFLibMacros.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config/cmake/HDFLibMacros.cmake b/config/cmake/HDFLibMacros.cmake index 8bc571f..dcf911b 100644 --- a/config/cmake/HDFLibMacros.cmake +++ b/config/cmake/HDFLibMacros.cmake @@ -54,8 +54,8 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type libtype jpeg_pic) 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}" + IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${JPEG_LIB_NAME}.lib" + IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${JPEG_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}" ) ELSE (MINGW) SET_TARGET_PROPERTIES(jpeg PROPERTIES @@ -168,8 +168,8 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding) IF (WIN32) IF (MINGW) SET_TARGET_PROPERTIES(szip 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}" + IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SZIP_LIB_NAME}.lib" + IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${SZIP_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}" ) ELSE (MINGW) SET_TARGET_PROPERTIES(szip PROPERTIES @@ -284,8 +284,8 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype) IF (WIN32) IF (MINGW) SET_TARGET_PROPERTIES(zlib 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}" + IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${ZLIB_LIB_NAME}.lib" + IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${ZLIB_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}" ) ELSE (MINGW) SET_TARGET_PROPERTIES(zlib PROPERTIES |