diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-01-18 14:57:22 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-01-18 14:57:22 (GMT) |
| commit | 6a9b816bde987f6ced009b0b1d1793e43103e013 (patch) | |
| tree | 4b4bbc89768a4896c5fbd21bbe81084a8a84c2ef /release_docs | |
| parent | aef900c6741aea851b218169648185b1c8e5e435 (diff) | |
| parent | 601ae0ebbc2b766ebf2662315b3143b0f903d76b (diff) | |
| download | hdf5-6a9b816bde987f6ced009b0b1d1793e43103e013.zip hdf5-6a9b816bde987f6ced009b0b1d1793e43103e013.tar.gz hdf5-6a9b816bde987f6ced009b0b1d1793e43103e013.tar.bz2 | |
Merge pull request #861 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '601ae0ebbc2b766ebf2662315b3143b0f903d76b':
HDFFV-10392 change size of local array to 16 chars
HDFFV-10385 rework java names
HDFFV-10385 Use OUTPUT_NAME property instead of CMAKE_BUILD_TYPE
Revert CMAKE_BUILD_TYPE for matches - need to redesign
Diffstat (limited to 'release_docs')
| -rw-r--r-- | release_docs/USING_HDF5_CMake.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt index ecf972d..5993a0f 100644 --- a/release_docs/USING_HDF5_CMake.txt +++ b/release_docs/USING_HDF5_CMake.txt @@ -37,7 +37,7 @@ I. Preconditions 1. We suggest you obtain the latest CMake for windows from the Kitware web site. The HDF5 1.10.x product requires a minimum CMake version - of 3.2.2. + of 3.10.1. 2. You have installed the HDF5 library built with CMake, by executing the HDF Install Utility (the *.msi file in the binary package for @@ -101,10 +101,10 @@ These steps are described in more detail below. * Unix Makefiles * Visual Studio 12 2013 * Visual Studio 12 2013 Win64 - * Visual Studio 11 2012 - * Visual Studio 11 2012 Win64 * Visual Studio 14 2015 * Visual Studio 14 2015 Win64 + * Visual Studio 15 2017 + * Visual Studio 15 2017 Win64 <options> is: * BUILD_TESTING:BOOL=ON @@ -180,7 +180,7 @@ Given the preconditions in section I, create a CMakeLists.txt file at the source root. Include the following text in the file: ########################################################## -cmake_minimum_required (VERSION 3.2.2) +cmake_minimum_required (VERSION 3.10.1) project (HDF5MyApp C CXX) set (LIB_TYPE STATIC) # or SHARED @@ -194,7 +194,6 @@ set (LINK_LIBS ${LINK_LIBS} ${HDF5_C_${LIB_TYPE}_LIBRARY}) set (example hdf_example) add_executable (${example} ${PROJECT_SOURCE_DIR}/${example}.c) -TARGET_NAMING (${example} ${LIB_TYPE}) TARGET_C_PROPERTIES (${example} ${LIB_TYPE} " " " ") target_link_libraries (${example} ${LINK_LIBS}) |