summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2013-10-02 21:51:01 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2013-10-02 21:51:01 (GMT)
commit9d05904ae05ffc1070b890ef140d527484b355b7 (patch)
tree18b2b40371f50e015221eef76605a2e0963c3061
parent738f1f0bd661daa07326b51c43c444cca7546f32 (diff)
downloadhdf5-9d05904ae05ffc1070b890ef140d527484b355b7.zip
hdf5-9d05904ae05ffc1070b890ef140d527484b355b7.tar.gz
hdf5-9d05904ae05ffc1070b890ef140d527484b355b7.tar.bz2
[svn-r24253] Add var for install file
-rwxr-xr-xbin/cmakehdf57
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/cmakehdf5 b/bin/cmakehdf5
index 1f3b21e..97f45ed 100755
--- a/bin/cmakehdf5
+++ b/bin/cmakehdf5
@@ -233,7 +233,6 @@ 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)
#-----------------------------------------------------------------------------
@@ -249,8 +248,10 @@ if [ $exit_code = 0 ]; then
else
echo Error encountered CTest script
fi
-echo installing...
-./*.sh > $install_log
+# Using HDF5-*.sh because actual name is unavailable
+install_sh=HDF5-*.sh
+echo installing with $install_sh ...
+./$install_sh --skip-license > $install_log
exit_code=$?
if [ $exit_code = 0 ]; then
echo Complete without error