summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--config/cmake/HDF5Macros.cmake18
2 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 304d86d..06ef526 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,7 +229,7 @@ INCLUDE (${HDF5_RESOURCES_DIR}/ConfigureChecks.cmake)
# Option to use legacy naming for windows libs/programs, default is legacy
#-----------------------------------------------------------------------------
IF (WIN32 AND NOT CYGWIN)
- OPTION (H5_LEGACY_NAMING "Use Legacy Names for Libraries and Programs" ON)
+ OPTION (HDF_LEGACY_NAMING "Use Legacy Names for Libraries and Programs" OFF)
ENDIF (WIN32 AND NOT CYGWIN)
#-----------------------------------------------------------------------------
diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake
index 3edb3a2..3b15e02 100644
--- a/config/cmake/HDF5Macros.cmake
+++ b/config/cmake/HDF5Macros.cmake
@@ -37,12 +37,12 @@ ENDMACRO (IDE_SOURCE_PROPERTIES)
MACRO (H5_NAMING target libtype)
IF (WIN32 AND NOT MINGW)
IF (${libtype} MATCHES "SHARED")
- IF (H5_LEGACY_NAMING)
+ IF (HDF_LEGACY_NAMING)
SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "dll")
SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "${target}")
- ELSE (H5_LEGACY_NAMING)
+ ELSE (HDF_LEGACY_NAMING)
SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "${target}dll")
- ENDIF (H5_LEGACY_NAMING)
+ ENDIF (HDF_LEGACY_NAMING)
ENDIF (${libtype} MATCHES "SHARED")
ENDIF (WIN32 AND NOT MINGW)
ENDMACRO (H5_NAMING)
@@ -52,26 +52,26 @@ MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype)
# message (STATUS "${libname} libtype: ${libtype}")
IF (${libtype} MATCHES "SHARED")
IF (WIN32 AND NOT MINGW)
- IF (H5_LEGACY_NAMING)
+ IF (HDF_LEGACY_NAMING)
SET (LIB_RELEASE_NAME "${libname}dll")
SET (LIB_DEBUG_NAME "${libname}ddll")
- ELSE (H5_LEGACY_NAMING)
+ ELSE (HDF_LEGACY_NAMING)
SET (LIB_RELEASE_NAME "${libname}")
SET (LIB_DEBUG_NAME "${libname}_D")
- ENDIF (H5_LEGACY_NAMING)
+ ENDIF (HDF_LEGACY_NAMING)
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 (H5_LEGACY_NAMING)
+ IF (HDF_LEGACY_NAMING)
SET (LIB_RELEASE_NAME "${libname}")
SET (LIB_DEBUG_NAME "${libname}d")
- ELSE (H5_LEGACY_NAMING)
+ ELSE (HDF_LEGACY_NAMING)
SET (LIB_RELEASE_NAME "lib${libname}")
SET (LIB_DEBUG_NAME "lib${libname}_D")
- ENDIF (H5_LEGACY_NAMING)
+ ENDIF (HDF_LEGACY_NAMING)
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)