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 /src/CMakeLists.txt | |
| 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 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 32fd1be..ef3e760 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -809,11 +809,8 @@ if (HDF5_GENERATE_HEADERS) COMMENT " Creating Assignment overflow macro" ) - add_custom_target(generate_precompiled DEPENDS - "${HDF5_SRC_DIR}/H5version.h;${HDF5_SRC_DIR}/H5overflow.h") - add_custom_target(run_perl_scripts ALL - DEPENDS ${HDF5_SRC_DIR}/H5Edefin.h ${HDF5_SRC_DIR}/H5version.h ${HDF5_SRC_DIR}/H5overflow.h + DEPENDS ${HDF5_SRC_DIR}/H5Edefin.h ${HDF5_SRC_DIR}/H5Einit.h ${HDF5_SRC_DIR}/H5Epubgen.h ${HDF5_SRC_DIR}/H5Eterm.h ${HDF5_SRC_DIR}/H5version.h ${HDF5_SRC_DIR}/H5overflow.h ) else (PERL_FOUND) message (STATUS "Cannot generate headers - perl not found") @@ -830,7 +827,7 @@ if (MSVC OR MINGW) target_link_libraries (H5detect "ws2_32.lib") endif (MSVC OR MINGW) if (HDF5_GENERATE_HEADERS) - add_dependencies(H5detect generate_precompiled) + add_dependencies(H5detect run_perl_scripts) else (HDF5_GENERATE_HEADERS) add_dependencies(H5detect "${H5_GENERATED_HEADERS}") endif (HDF5_GENERATE_HEADERS) @@ -849,7 +846,7 @@ if (MSVC OR MINGW) target_link_libraries (H5make_libsettings "ws2_32.lib") endif (MSVC OR MINGW) if (HDF5_GENERATE_HEADERS) - add_dependencies(H5detect generate_precompiled) + add_dependencies(H5make_libsettings run_perl_scripts) else (HDF5_GENERATE_HEADERS) add_dependencies(H5make_libsettings "${H5_GENERATED_HEADERS}") endif (HDF5_GENERATE_HEADERS) |