summaryrefslogtreecommitdiffstats
path: root/config/cmake
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-12-01 04:10:34 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-12-01 04:10:34 (GMT)
commit6357e171855b4050d040a6e7b4ddc8a42d0f2d0b (patch)
tree204ea629d7574ff5c38c8315b1fb38308a0f8e1b /config/cmake
parent32f91a685b1770db49d6deda541c52f64665950c (diff)
downloadhdf5-6357e171855b4050d040a6e7b4ddc8a42d0f2d0b.zip
hdf5-6357e171855b4050d040a6e7b4ddc8a42d0f2d0b.tar.gz
hdf5-6357e171855b4050d040a6e7b4ddc8a42d0f2d0b.tar.bz2
[svn-r21785] Correct static lib naming when on windows
Diffstat (limited to 'config/cmake')
-rw-r--r--config/cmake/HDFMacros.cmake27
1 files changed, 5 insertions, 22 deletions
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake
index 5f397fc..da24f9c 100644
--- a/config/cmake/HDFMacros.cmake
+++ b/config/cmake/HDFMacros.cmake
@@ -220,7 +220,6 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype)
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
-DCMAKE_ANSI_CFLAGS:STRING=${CMAKE_ANSI_CFLAGS}
- -DHDF_LEGACY_NAMING:BOOL=${HDF_LEGACY_NAMING}
)
ELSEIF (${compress_type} MATCHES "TGZ")
EXTERNALPROJECT_ADD (ZLIB
@@ -236,7 +235,6 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype)
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
-DCMAKE_ANSI_CFLAGS:STRING=${CMAKE_ANSI_CFLAGS}
- -DHDF_LEGACY_NAMING:BOOL=${HDF_LEGACY_NAMING}
)
ENDIF (${compress_type} MATCHES "SVN")
EXTERNALPROJECT_GET_PROPERTY (ZLIB BINARY_DIR SOURCE_DIR)
@@ -342,12 +340,7 @@ ENDMACRO (IDE_SOURCE_PROPERTIES)
MACRO (TARGET_NAMING target libtype)
IF (WIN32 AND NOT MINGW)
IF (${libtype} MATCHES "SHARED")
- IF (HDF_LEGACY_NAMING)
- SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "dll")
- SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "${target}")
- ELSE (HDF_LEGACY_NAMING)
- SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "${target}dll")
- ENDIF (HDF_LEGACY_NAMING)
+ SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "${target}dll")
ENDIF (${libtype} MATCHES "SHARED")
ENDIF (WIN32 AND NOT MINGW)
ENDMACRO (TARGET_NAMING)
@@ -357,26 +350,16 @@ MACRO (HDF_SET_LIB_OPTIONS libtarget libname libtype)
# message (STATUS "${libname} libtype: ${libtype}")
IF (${libtype} MATCHES "SHARED")
IF (WIN32 AND NOT MINGW)
- 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 AND NOT MINGW)
SET (LIB_RELEASE_NAME "${libname}")
SET (LIB_DEBUG_NAME "${libname}_debug")
ENDIF (WIN32 AND NOT MINGW)
ELSE (${libtype} MATCHES "SHARED")
IF (WIN32 AND NOT MINGW)
- 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 AND NOT MINGW)
# if the generator supports configuration types or if the CMAKE_BUILD_TYPE has a value
IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)