diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-01-13 20:45:30 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-01-13 20:45:30 (GMT) |
| commit | 509b6c24a7793b8fddd15a6abb6f9573f7adae3e (patch) | |
| tree | 1b82e8b527b8de093f8f29e42332296c8ee4c8f7 /tools/lib | |
| parent | bd85e57904f1f943774bb99ea5e8b0d074db0edb (diff) | |
| parent | 110073450f84fb373a6f28579cdc5751c3eca3b0 (diff) | |
| download | hdf5-509b6c24a7793b8fddd15a6abb6f9573f7adae3e.zip hdf5-509b6c24a7793b8fddd15a6abb6f9573f7adae3e.tar.gz hdf5-509b6c24a7793b8fddd15a6abb6f9573f7adae3e.tar.bz2 | |
Merge pull request #251 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '110073450f84fb373a6f28579cdc5751c3eca3b0':
Add unused -parameters to developer group.
Add addition hint info about option
Correct variable name
Missing file remove added to test
Update developer flags to account for gcc version
Move Windows level 4 warnings to developer option
Fix test output file name
Changed severity of message state
Remove duplicate command
CMake command cleanup
HDFFV-10094: upgrade cmake command conventions Also converted tests to use macros
Update cmake min version and cmake command convention
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt index bfd1af2..1968460 100644 --- a/tools/lib/CMakeLists.txt +++ b/tools/lib/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.1.0) +cmake_minimum_required (VERSION 3.2.2) PROJECT (HDF5_TOOLS_LIB) #----------------------------------------------------------------------------- @@ -63,7 +63,7 @@ if (BUILD_SHARED_LIBS) ) #set_property (TARGET ${HDF5_TOOLS_LIBSH_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS H5DIFF_DEBUG) set (install_targets ${install_targets} ${HDF5_TOOLS_LIBSH_TARGET}) -endif (BUILD_SHARED_LIBS) +endif () ############################################################################## ############################################################################## @@ -89,7 +89,7 @@ install ( if (HDF5_EXPORTED_TARGETS) if (BUILD_SHARED_LIBS) INSTALL_TARGET_PDB (${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} toolslibraries) - endif (BUILD_SHARED_LIBS) + endif () install ( TARGETS @@ -102,4 +102,4 @@ if (HDF5_EXPORTED_TARGETS) FRAMEWORK DESTINATION ${HDF5_INSTALL_FWRK_DIR} COMPONENT toolslibraries INCLUDES DESTINATION include ) -endif (HDF5_EXPORTED_TARGETS) +endif () |