diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | scripts/check-dependencies.sh | 26 |
2 files changed, 26 insertions, 2 deletions
@@ -91,7 +91,7 @@ Follow the instructions for the platform you're compiling on below. * [MPFR (3.x)](http://www.mpfr.org/) * [boost (1.35 - 1.47)](http://www.boost.org/) * [OpenCSG (1.3.2)](http://www.opencsg.org/) -* [GLEW (1.6 ->)](http://glew.sourceforge.net/) +* [GLEW (1.5.4 ->)](http://glew.sourceforge.net/) * [Eigen (2.0.13->3.1.1)](http://eigen.tuxfamily.org/) * [GCC C++ Compiler (4.2 ->)](http://gcc.gnu.org/) * [Bison (2.4)](http://www.gnu.org/software/bison/) diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh index e1afba5..bbf1baf 100755 --- a/scripts/check-dependencies.sh +++ b/scripts/check-dependencies.sh @@ -116,7 +116,23 @@ qt4_sysver() glew_sysver() { - glew_sysver_result= # glew has no traditional version numbers + glewh=$1/include/GL/glew.h + if [ -e $glewh ]; then + # glew has no traditional version number in it's headers + # so we either test for what we need and 'guess', or assign it to 0.0 + # the resulting number is a 'lower bound', not exactly what is installed + if [ "`grep __GLEW_VERSION_4_2 $glewh`" ]; then + glew_sysver_result=1.7.0 + fi + if [ ! $glew_sysver_result ]; then + if [ "`grep __GLEW_ARB_occlusion_query2 $glewh`" ]; then + glew_sysver_result=1.5.4 + fi + fi + if [ ! $glew_sysver_result ]; then + glew_sysver_result=0.0 + fi + fi } imagemagick_sysver() @@ -148,9 +164,13 @@ gcc_sysver() bingcc=gcc; fi fi + debug using bingcc: $bingcc if [ ! -x $bingcc ]; then return; fi if [ ! "`$bingcc --version`" ]; then return; fi gccver=`$bingcc --version| grep -i gcc` + debug gcc output1: $gccver + gccver=`echo $gccver | sed s/"(.*)"//g ` + debug gcc output2: $gccver gccver=`echo $gccver | sed s/"[^0-9. ]"/" "/g | awk '{print $1}'` gcc_sysver_result=$gccver } @@ -562,6 +582,7 @@ find_installed_version() # use pkg-config to search if [ ! $fsv_tmp ]; then if [ "`command -v pkg-config`" ]; then + debug plain search failed. trying pkg_config... pkg_config_search $dep fsv_tmp=$pkg_config_search_result fi @@ -569,12 +590,15 @@ find_installed_version() # use the package system to search if [ ! $fsv_tmp ]; then + debug plain + pkg_config search both failed... trying package search pkg_search $dep fsv_tmp=$pkg_search_result fi if [ $fsv_tmp ]; then find_installed_version_result=$fsv_tmp + else + debug all searches failed. unknown version. fi } |