philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r22191] Update MINGW configuration

Browse Source
This commit is contained in:
Allen Byrne
2012-03-29 12:53:02 -05:00
parent 646374e701
commit f1fd281d9e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
config/cmake/HDFMacros.cmake
View File

@@ -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}