diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2018-11-12 22:23:54 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2018-11-12 22:23:54 (GMT) |
| commit | e2ed2edf6ef1111b1f9962bd44f8f76612adf8d0 (patch) | |
| tree | 639ae80b9c412115bbb178fc97276104304c093e /src | |
| parent | 17f9cb41583a1f7195337791852214d02c24a005 (diff) | |
| parent | f515574dcfdb9be2c5b788e472833da47a8105a7 (diff) | |
| download | hdf5-e2ed2edf6ef1111b1f9962bd44f8f76612adf8d0.zip hdf5-e2ed2edf6ef1111b1f9962bd44f8f76612adf8d0.tar.gz hdf5-e2ed2edf6ef1111b1f9962bd44f8f76612adf8d0.tar.bz2 | |
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into stackable_vol
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2ef9dad..341fa7a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -948,23 +948,29 @@ if (NOT EXISTS ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c) ${HDF5_BINARY_DIR}/${HDF5_BATCH_H5DETECT_SCRIPT} ESCAPE_QUOTES @ONLY ) add_custom_command ( - OUTPUT ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c + OUTPUT ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.tmp COMMAND ${HDF5_BATCH_CMD} ARGS ${HDF5_BINARY_DIR}/${HDF5_BATCH_H5DETECT_SCRIPT} DEPENDS H5detect WORKING_DIRECTORY ${HDF5_GENERATED_SOURCE_DIR} ) - set_source_files_properties (${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c PROPERTIES GENERATED TRUE) else () add_custom_command ( - OUTPUT ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c + OUTPUT ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.tmp COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR}$<TARGET_FILE:H5detect> - ARGS ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c + ARGS ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.tmp DEPENDS H5detect WORKING_DIRECTORY ${HDF5_GENERATED_SOURCE_DIR} ) - set_source_files_properties (${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c PROPERTIES GENERATED TRUE) endif () + add_custom_target (gen_H5Tinit ALL DEPENDS ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.tmp) + add_custom_command ( + OUTPUT ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c + COMMAND ${CMAKE_COMMAND} + ARGS -E copy_if_different "${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.tmp" "${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c" + DEPENDS gen_H5Tinit ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.tmp + ) + set_source_files_properties (${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c PROPERTIES GENERATED TRUE) endif () if (BUILD_SHARED_LIBS) add_custom_command ( |