diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-12-20 18:35:44 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-12-20 18:35:44 (GMT) |
| commit | bbcc2a070855c0481e6cab74178c5684960bdcd8 (patch) | |
| tree | 223c31644b629ee79ac8384d48155d1f7a90aa75 /scripts/check-dependencies.sh | |
| parent | 67ba3cb3d2f6ef1d9857fc40f8d764e9c0602932 (diff) | |
update boost version. allow 'out of tree' dependency check. fix cmake detection
Diffstat (limited to 'scripts/check-dependencies.sh')
| -rwxr-xr-x | scripts/check-dependencies.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh index 536c46f..0401fbb 100755 --- a/scripts/check-dependencies.sh +++ b/scripts/check-dependencies.sh @@ -161,7 +161,7 @@ curl_sysver() cmake_sysver() { if [ ! -x $1/bin/cmake ]; then return ; fi - cmake_sysver_result=`$1/bin/cmake --version | grep cmake | sed s/"[^0-9.]"/" "/g` + cmake_sysver_result=`$1/bin/cmake --version | grep cmake | sed s/"[^0-9.]"/" "/g | awk '{ print $1 }'` } make_sysver() @@ -364,6 +364,11 @@ get_minversion_from_readme() { if [ -e README.md ]; then READFILE=README.md; fi if [ -e ../README.md ]; then READFILE=../README.md; fi + if [ ! $READFILE ]; then + if [ "`command -v dirname`" ]; then + READFILE=`dirname $0`/../README.md + fi + fi if [ ! $READFILE ]; then echo "cannot find README.md"; exit; fi debug get_minversion_from_readme $* if [ ! $1 ]; then return; fi |