diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-10-04 07:33:40 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-10-04 07:33:40 (GMT) |
| commit | 914643490ab581c4b0bb78ca30a8e1fa520b4d6d (patch) | |
| tree | 53436d1611395e02c652c7ac5c075898fc2ae261 /hl | |
| parent | 0ee053bb95a620b6f8109d22a372f6acc1cee300 (diff) | |
| parent | 888a002cddaa4e1d9a165ea01dfe62f399df9eb9 (diff) | |
| download | hdf5-914643490ab581c4b0bb78ca30a8e1fa520b4d6d.zip hdf5-914643490ab581c4b0bb78ca30a8e1fa520b4d6d.tar.gz hdf5-914643490ab581c4b0bb78ca30a8e1fa520b4d6d.tar.bz2 | |
[svn-r27946] Brought VDS branch in sync with trunk (up to r27945).
Tested on Ubuntu 15.04 (Linux 3.19 x86_64), gcc 4.9.2, MPICH 3.1.4
and CMake 3.3.2.
- Autotools serial w/ Fortran, C++
- Autotools parallel w/ Fortran
- CMake serial w/ Fortran, C++
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/src/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt index a90e3c8..df1962b 100644 --- a/hl/src/CMakeLists.txt +++ b/hl/src/CMakeLists.txt @@ -20,20 +20,22 @@ if (HDF5_GENERATE_HEADERS) add_custom_command ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.c ${CMAKE_CURRENT_BINARY_DIR}/H5LTparse.h + PRE_BUILD COMMAND "${CMAKE_COMMAND}" -D "GEN_DIR=genLT" -D "FILE_PARSE=H5LTparse" -P "${HDF_RESOURCES_DIR}/HDF5_Process_Flex_Files.cmake" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/genLT/H5LTparse.c" + DEPENDS "${BISON_H5LT_PARSER_OUTPUTS}" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) add_custom_command ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/H5LTanalyze.c + PRE_BUILD COMMAND "${CMAKE_COMMAND}" -D "GEN_DIR=genLT" -D "FILE_ANALYZE=H5LTanalyze.c" -P "${HDF_RESOURCES_DIR}/HDF5_Process_Flex_Files.cmake" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/genLT/H5LTanalyze.c" + DEPENDS "${FLEX_H5LT_SCANNER_OUTPUTS}" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) add_custom_target (process_gen_H5LT |