diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-01-25 14:19:47 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-01-25 14:19:47 (GMT) |
| commit | d7aeffc201f4f408688a892377bc5ff8840a3900 (patch) | |
| tree | 3e82143a3e6fed0eccb3cf7fb6998fdabcaccaf0 | |
| parent | c5e311897444abe43b9dafcf0225e9fb880a3e2b (diff) | |
| parent | f22d8726707e26b97df38962b404754119e8abd7 (diff) | |
| download | hdf5-d7aeffc201f4f408688a892377bc5ff8840a3900.zip hdf5-d7aeffc201f4f408688a892377bc5ff8840a3900.tar.gz hdf5-d7aeffc201f4f408688a892377bc5ff8840a3900.tar.bz2 | |
Merge pull request #864 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f22d8726707e26b97df38962b404754119e8abd7':
HDFFV-10385 some platforms need this var
HDFFV-10385 test OUTPUT_NAME var for mac
HDFFV-10385 Correct name of var
| -rw-r--r-- | config/cmake/libhdf5.settings.cmake.in | 2 | ||||
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in index 28fb876..7bb426f 100644 --- a/config/cmake/libhdf5.settings.cmake.in +++ b/config/cmake/libhdf5.settings.cmake.in @@ -13,7 +13,7 @@ General Information: Compiling Options: ------------------ - Build Mode: @HDF5_BUILD_TYPE@ + Build Mode: @HDF_BUILD_TYPE@ Debugging Symbols: @SYMBOLS@ Asserts: @ASSERTS@ Profiling: @PROFILING@ diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index 870ff5a..1326420 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -124,8 +124,8 @@ macro (HDF_SET_LIB_OPTIONS libtarget libname libtype) set_target_properties (${libtarget} PROPERTIES -# OUTPUT_NAME -# ${LIB_RELEASE_NAME}$<$<CONFIG:Debug>:${LIB_DEBUG_SUFFIX}> + OUTPUT_NAME + ${LIB_RELEASE_NAME} OUTPUT_NAME_DEBUG ${LIB_DEBUG_NAME} OUTPUT_NAME_RELEASE |