summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2015-04-21 00:25:56 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2015-04-21 00:25:56 (GMT)
commit34a1da1731eb1818d5bf374745672cf289522c31 (patch)
tree527924d89317907424067d5b184903d4d516a6bb /bin
parent0b0d31e5201e76eae1cb0d219d68934d8c0942b7 (diff)
downloadhdf5-34a1da1731eb1818d5bf374745672cf289522c31.zip
hdf5-34a1da1731eb1818d5bf374745672cf289522c31.tar.gz
hdf5-34a1da1731eb1818d5bf374745672cf289522c31.tar.bz2
[svn-r26857] 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')
-rwxr-xr-xbin/cmakehdf58
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