From 738f1f0bd661daa07326b51c43c444cca7546f32 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Wed, 2 Oct 2013 16:38:25 -0500 Subject: [svn-r24252] add log vars --- bin/cmakehdf5 | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/bin/cmakehdf5 b/bin/cmakehdf5 index 6339698..1f3b21e 100755 --- a/bin/cmakehdf5 +++ b/bin/cmakehdf5 @@ -14,6 +14,8 @@ DPRINT=: progname=`basename $0` # program name cminfile="cmakemin.$$" # Cmake minimum file cfgfile=$progname.$$ # configure file +ctest_log=ctest.log # output of ctest script +install_log=install.log # output of installation $DPRINT $cfgfile # Remove temporary generated files if exit 0 @@ -36,7 +38,8 @@ TIMESTAMP # Explain what and where log files are. cat <.log: output of configure LastBuild_.log: output of build @@ -230,6 +233,7 @@ if(NOT LOCAL_MEMCHECK_TEST) ERROR_VARIABLE cpackLog.err ) file(WRITE ${CTEST_BINARY_DIRECTORY}/cpack.log "${cpackLog.err}" "${cpackLog}") + message ("installing with ${CPACK_PACKAGE_FILE_NAME} in ./usr") endif(NOT LOCAL_MEMCHECK_TEST) #----------------------------------------------------------------------------- @@ -238,7 +242,15 @@ EOF # Run ctest -ctest -S $cfgfile -C Release -V -O ctest.log +ctest -S $cfgfile -C Release -V -O $ctest_log +exit_code=$? +if [ $exit_code = 0 ]; then + echo CTest script completed without error +else + echo Error encountered CTest script +fi +echo installing... +./*.sh > $install_log exit_code=$? if [ $exit_code = 0 ]; then echo Complete without error -- cgit v0.12