diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-10-14 20:14:22 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-10-14 20:14:22 (GMT) |
| commit | 1ae1dc8a319acfffb3a757ddeb08cade6ab6750b (patch) | |
| tree | 0a108ece12946e2dd976f6f38035f67e89ac024e /tools/h5jam/CMakeLists.txt | |
| parent | 871e3ca614dd76302594663be9ee7bd5e84157c9 (diff) | |
| parent | 321db89a65909c02d7279fed7e8b7a3585cde8da (diff) | |
| download | hdf5-1ae1dc8a319acfffb3a757ddeb08cade6ab6750b.zip hdf5-1ae1dc8a319acfffb3a757ddeb08cade6ab6750b.tar.gz hdf5-1ae1dc8a319acfffb3a757ddeb08cade6ab6750b.tar.bz2 | |
Merge pull request #76 in HDFFV/hdf5 from ~BYRN/hdf5_adb:bugfix/HDFFV-10003-examples-project-fails-to-build to develop
* commit '321db89a65909c02d7279fed7e8b7a3585cde8da':
Remove test only tools from exports
Fix typo
Correct typo in variable format
Description: Fixed typo that caused daily test failed when --enable-deprecated-symbols is used. Also, removed a commented-out function. Platforms tested: Linux/32 2.6 (jam) Linux/64 (platypus) with --enable-deprecated-symbols
Description: Added test file titerate.cpp. Platform tested: Verified with bin/chkmanifest
Description: Removed commented out lines. Platform tested Jam (only comments)
Purpose: Fix bug HDFFR-9920 cont. Description: Added new test file titerate.cpp.
Fix:HDFFV-9987 With HDF5-1.10 you cannot specify default dataspace for Fortran (H5S_ALL_F)
Removed unused H5T_NATIVE_INTEGER_# variables due to NAG fixes.
Purpose: Updated documentation Description: Revised class brief description and other comments for up-to-date info. Platforms tested: Linux/32 2.6 (jam) Linux/64 (platypus) Darwin (osx1010test)
Purpose: Fix bug HDFFR-9920 cont. Description: Adding user's test revealed a flaw in the fix. Moved CommonFG's functions in Group to H5Location, so that they could be called by objects that can be used to specify a location Also, rearranged many "#include" header files to resolve conflicts.
Add support for namespace and add tools to binaries config
Diffstat (limited to 'tools/h5jam/CMakeLists.txt')
| -rw-r--r-- | tools/h5jam/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/h5jam/CMakeLists.txt b/tools/h5jam/CMakeLists.txt index 0a9aa6c..edf121f 100644 --- a/tools/h5jam/CMakeLists.txt +++ b/tools/h5jam/CMakeLists.txt @@ -14,6 +14,7 @@ TARGET_NAMING (h5jam STATIC) TARGET_C_PROPERTIES (h5jam STATIC " " " ") target_link_libraries (h5jam ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) set_target_properties (h5jam PROPERTIES FOLDER tools) +set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5jam") add_executable (getub ${HDF5_TOOLS_H5JAM_SOURCE_DIR}/getub.c) TARGET_NAMING (getub STATIC) @@ -32,6 +33,7 @@ TARGET_NAMING (h5unjam STATIC) TARGET_C_PROPERTIES (h5unjam STATIC " " " ") target_link_libraries (h5unjam ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) set_target_properties (h5unjam PROPERTIES FOLDER tools) +set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5unjam") set (H5_DEP_EXECUTABLES h5jam @@ -50,7 +52,7 @@ if (BUILD_TESTING) TARGET_C_PROPERTIES (testhdf5 STATIC " " " ") target_link_libraries (h5jamgentest ${HDF5_LIB_TARGET}) set_target_properties (h5jamgentest PROPERTIES FOLDER generator/tools) - + #add_test (NAME h5jamgentest COMMAND $<TARGET_FILE:h5jamgentest>) endif (HDF5_BUILD_GENERATORS) |