diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2012-03-29 22:16:38 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2012-03-29 22:16:38 (GMT) |
| commit | 3690a875f227fbb45b77a43eed6c6c245a635657 (patch) | |
| tree | 6ccf7a020140342f160bc0a19f51919261f8ab11 /config/cmake/FindSZIP.cmake | |
| parent | 40c3252951eba713768fd803f73513485390be34 (diff) | |
| download | hdf5-3690a875f227fbb45b77a43eed6c6c245a635657.zip hdf5-3690a875f227fbb45b77a43eed6c6c245a635657.tar.gz hdf5-3690a875f227fbb45b77a43eed6c6c245a635657.tar.bz2 | |
[svn-r22198] Update MINGW configuration (MinGW is Windows except for some issues)
Diffstat (limited to 'config/cmake/FindSZIP.cmake')
| -rw-r--r-- | config/cmake/FindSZIP.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/config/cmake/FindSZIP.cmake b/config/cmake/FindSZIP.cmake index 6118f7a..05d42cf 100644 --- a/config/cmake/FindSZIP.cmake +++ b/config/cmake/FindSZIP.cmake @@ -44,11 +44,11 @@ MACRO (SZIP_ADJUST_LIB_VARS basename) # if the generator supports configuration types then set # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) - SET (${basename}_LIBRARY optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG}) + SET (${basename}_LIBRARY optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG}) ELSE(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) - # if there are no configuration types and CMAKE_BUILD_TYPE has no value - # then just use the release libraries - SET (${basename}_LIBRARY ${${basename}_LIBRARY_RELEASE} ) + # if there are no configuration types and CMAKE_BUILD_TYPE has no value + # then just use the release libraries + SET (${basename}_LIBRARY ${${basename}_LIBRARY_RELEASE} ) ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) SET (${basename}_LIBRARIES optimized ${${basename}_LIBRARY_RELEASE} debug ${${basename}_LIBRARY_DEBUG}) ENDIF (${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE) @@ -90,13 +90,13 @@ FIND_PATH (SZIP_INCLUDE_DIR NO_DEFAULT_PATH ) -IF (WIN32 AND NOT MINGW) +IF (WIN32W) SET (SZIP_SEARCH_DEBUG_NAMES "sz_d;libsz_d") SET (SZIP_SEARCH_RELEASE_NAMES "sz;libsz") -ELSE (WIN32 AND NOT MINGW) +ELSE (WIN32) SET (SZIP_SEARCH_DEBUG_NAMES "sz_d") SET (SZIP_SEARCH_RELEASE_NAMES "sz") -ENDIF (WIN32 AND NOT MINGW) +ENDIF (WIN32) # Look for the library. FIND_LIBRARY (SZIP_LIBRARY_DEBUG |