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

[svn-r23301]

Browse Source
This commit is contained in:
Allen Byrne
2013-02-18 14:03:53 -05:00
parent 79bc86c220
commit 1629fd1ee7
75 changed files with 4815 additions and 1407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
config/cmake/HDFMacros.cmake
View File

@@ -37,12 +37,7 @@ ENDMACRO (IDE_SOURCE_PROPERTIES)
MACRO (TARGET_NAMING libtarget libtype)
IF (WIN32)
IF (${libtype} MATCHES "SHARED")
IF (HDF_LEGACY_NAMING)
SET_TARGET_PROPERTIES (${libtarget} PROPERTIES OUTPUT_NAME "dll")
SET_TARGET_PROPERTIES (${libtarget} PROPERTIES PREFIX "${libtarget}")
ELSE (HDF_LEGACY_NAMING)
SET_TARGET_PROPERTIES (${libtarget} PROPERTIES OUTPUT_NAME "${libtarget}dll")
ENDIF (HDF_LEGACY_NAMING)
SET_TARGET_PROPERTIES (${libtarget} PROPERTIES OUTPUT_NAME "${libtarget}dll")
ENDIF (${libtype} MATCHES "SHARED")
ENDIF (WIN32)
ENDMACRO (TARGET_NAMING)
@@ -83,26 +78,16 @@ MACRO (HDF_SET_LIB_OPTIONS libtarget libname libtype)
# message (STATUS "${libname} libtype: ${libtype}")
IF (${libtype} MATCHES "SHARED")
IF (WIN32)
IF (HDF_LEGACY_NAMING)
SET (LIB_RELEASE_NAME "${libname}dll")
SET (LIB_DEBUG_NAME "${libname}ddll")
ELSE (HDF_LEGACY_NAMING)
SET (LIB_RELEASE_NAME "${libname}")
SET (LIB_DEBUG_NAME "${libname}_D")
ENDIF (HDF_LEGACY_NAMING)
SET (LIB_RELEASE_NAME "${libname}")
SET (LIB_DEBUG_NAME "${libname}_D")
ELSE (WIN32)
SET (LIB_RELEASE_NAME "${libname}")
SET (LIB_DEBUG_NAME "${libname}_debug")
ENDIF (WIN32)
ELSE (${libtype} MATCHES "SHARED")
IF (WIN32)
IF (HDF_LEGACY_NAMING)
SET (LIB_RELEASE_NAME "${libname}")
SET (LIB_DEBUG_NAME "${libname}d")
ELSE (HDF_LEGACY_NAMING)
SET (LIB_RELEASE_NAME "lib${libname}")
SET (LIB_DEBUG_NAME "lib${libname}_D")
ENDIF (HDF_LEGACY_NAMING)
SET (LIB_RELEASE_NAME "lib${libname}")
SET (LIB_DEBUG_NAME "lib${libname}_D")
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)