diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-03-22 20:32:25 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-03-22 20:32:25 (GMT) |
| commit | 814c592c473aa58270a7e6ac2d8a75cd8b37df1b (patch) | |
| tree | 12738bbc2f1cbc155fed9b33b966957d70b9ce83 /src | |
| parent | 1bdaa16d426bb062f1b5a0665ea1e41626d68c28 (diff) | |
| download | hdf5-814c592c473aa58270a7e6ac2d8a75cd8b37df1b.zip hdf5-814c592c473aa58270a7e6ac2d8a75cd8b37df1b.tar.gz hdf5-814c592c473aa58270a7e6ac2d8a75cd8b37df1b.tar.bz2 | |
[svn-r29525] Merge of r29509 from revise_chunks.
Misc. CMake and autotools enhancements.
Tested on: jam
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/libhdf5.settings.in | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 03c2773..d93612b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -792,7 +792,6 @@ set (H5_GENERATED_HEADERS ) option (HDF5_GENERATE_HEADERS "Rebuild Generated Files" OFF) -mark_as_advanced (HDF5_GENERATE_HEADERS) if (HDF5_GENERATE_HEADERS) set_source_files_properties(${H5_GENERATED_HEADERS} PROPERTIES GENERATED TRUE) find_package (Perl) diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in index b54257f..8017594 100644 --- a/src/libhdf5.settings.in +++ b/src/libhdf5.settings.in @@ -60,8 +60,9 @@ Languages: @BUILD_CXX_CONDITIONAL_TRUE@ Shared C++ Library: @enable_shared@ @BUILD_CXX_CONDITIONAL_TRUE@ Static C++ Library: @enable_static@ - JAVA: @HDF_JAVA@ -@BUILD_JAVA_CONDITIONAL_TRUE@ JAVA Compiler: @JAVA_VERSION@ + Java: @HDF_JAVA@ +@BUILD_JAVA_CONDITIONAL_TRUE@ Java Compiler: @JAVA_VERSION@ + Features: --------- |