diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2015-04-21 00:53:06 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2015-04-21 00:53:06 (GMT) |
| commit | 3daf1c9f2f58f9549a8f615d5c45bb35c243800c (patch) | |
| tree | fb9573603ef9712d427647d220d6bdb263cf93a2 /bin/cmakehdf5 | |
| parent | a2a9aaacde4d199d3dfb669a5ef3db4ded6dec1c (diff) | |
| download | hdf5-3daf1c9f2f58f9549a8f615d5c45bb35c243800c.zip hdf5-3daf1c9f2f58f9549a8f615d5c45bb35c243800c.tar.gz hdf5-3daf1c9f2f58f9549a8f615d5c45bb35c243800c.tar.bz2 | |
[svn-r26858] Merge r26857 from trunk.
Bugs:
The configure summary (libhdf5.settings) was missing from the configure output.
Solution:
Append the configure summary to the configure logfile if configure succeeds.
Tested:
hand ran cmakehdf5 in jam and inspected the logfile.
Diffstat (limited to 'bin/cmakehdf5')
| -rwxr-xr-x | bin/cmakehdf5 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/cmakehdf5 b/bin/cmakehdf5 index 1f0fb7c..4842f45 100755 --- a/bin/cmakehdf5 +++ b/bin/cmakehdf5 @@ -23,6 +23,7 @@ makelog="#${progname}_2build.log" testlog="#${progname}_3test.log" packlog="#${progname}_4pack.log" installlog="#${progname}_5install.log" +config_summary=libhdf5.settings exit_code=0 # This command should be in the source directory's bin/ @@ -212,9 +213,9 @@ if [ $? != 0 ]; then echo $vers failed. Aborted. exit 1 fi -echo Running Cmake for HDF5-${version} ... - +echo Running Cmake for HDF5-${version} ... # 4. Configure the C library, tools and tests with this command: +# If successful, append the configure summary to the configure logfile. STEP "Configure..." "cmake \ -C $cacheinit \ $build_cpp_lib \ @@ -225,7 +226,8 @@ STEP "Configure..." "cmake \ $build_tools \ $with_zlib \ $with_szlib \ - $srcdir" $configlog + $srcdir" $configlog &&\ + cat $config_summary >> $configlog # 5. Build the C library, tools and tests with this command: STEP "Build the library, tools and tests, ..." "cmake --build . --config Release" $makelog |