diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2012-03-29 17:53:02 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2012-03-29 17:53:02 (GMT) |
| commit | f1fd281d9e2a52ae44ef91a8a3f6fdb95e9bd636 (patch) | |
| tree | 2f639d2c987c816eca0f43e936324e7a6b5f2d88 | |
| parent | 646374e701e5fb7e07274712617af5868859d303 (diff) | |
| download | hdf5-f1fd281d9e2a52ae44ef91a8a3f6fdb95e9bd636.zip hdf5-f1fd281d9e2a52ae44ef91a8a3f6fdb95e9bd636.tar.gz hdf5-f1fd281d9e2a52ae44ef91a8a3f6fdb95e9bd636.tar.bz2 | |
[svn-r22191] Update MINGW configuration
| -rw-r--r-- | config/cmake/HDFMacros.cmake | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake index 44fdb65..b90d718 100644 --- a/config/cmake/HDFMacros.cmake +++ b/config/cmake/HDFMacros.cmake @@ -35,7 +35,7 @@ ENDMACRO (IDE_SOURCE_PROPERTIES) #------------------------------------------------------------------------------- MACRO (TARGET_NAMING target libtype) - IF (WIN32 AND NOT MINGW) + IF (WIN32) IF (${libtype} MATCHES "SHARED") IF (HDF_LEGACY_NAMING) SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "dll") @@ -44,14 +44,14 @@ MACRO (TARGET_NAMING target libtype) SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "${target}dll") ENDIF (HDF_LEGACY_NAMING) ENDIF (${libtype} MATCHES "SHARED") - ENDIF (WIN32 AND NOT MINGW) + ENDIF (WIN32) ENDMACRO (TARGET_NAMING) #------------------------------------------------------------------------------- MACRO (HDF_SET_LIB_OPTIONS libtarget libname libtype) # message (STATUS "${libname} libtype: ${libtype}") IF (${libtype} MATCHES "SHARED") - IF (WIN32 AND NOT MINGW) + IF (WIN32) IF (HDF_LEGACY_NAMING) SET (LIB_RELEASE_NAME "${libname}dll") SET (LIB_DEBUG_NAME "${libname}ddll") @@ -59,12 +59,12 @@ MACRO (HDF_SET_LIB_OPTIONS libtarget libname libtype) SET (LIB_RELEASE_NAME "${libname}") SET (LIB_DEBUG_NAME "${libname}_D") ENDIF (HDF_LEGACY_NAMING) - ELSE (WIN32 AND NOT MINGW) + ELSE (WIN32) SET (LIB_RELEASE_NAME "${libname}") SET (LIB_DEBUG_NAME "${libname}_debug") - ENDIF (WIN32 AND NOT MINGW) + ENDIF (WIN32) ELSE (${libtype} MATCHES "SHARED") - IF (WIN32 AND NOT MINGW) + IF (WIN32) IF (HDF_LEGACY_NAMING) SET (LIB_RELEASE_NAME "${libname}") SET (LIB_DEBUG_NAME "${libname}d") @@ -72,7 +72,7 @@ MACRO (HDF_SET_LIB_OPTIONS libtarget libname libtype) SET (LIB_RELEASE_NAME "lib${libname}") SET (LIB_DEBUG_NAME "lib${libname}_D") ENDIF (HDF_LEGACY_NAMING) - ELSE (WIN32 AND NOT MINGW) + ELSE (WIN32) # if the generator supports configuration types or if the CMAKE_BUILD_TYPE has a value IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) SET (LIB_RELEASE_NAME "${libname}") @@ -81,7 +81,7 @@ MACRO (HDF_SET_LIB_OPTIONS libtarget libname libtype) SET (LIB_RELEASE_NAME "lib${libname}") SET (LIB_DEBUG_NAME "lib${libname}_debug") ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) - ENDIF (WIN32 AND NOT MINGW) + ENDIF (WIN32) ENDIF (${libtype} MATCHES "SHARED") SET_TARGET_PROPERTIES (${libtarget} |