diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/setenv-unibuild.sh | 28 | 
1 files changed, 19 insertions, 9 deletions
| diff --git a/scripts/setenv-unibuild.sh b/scripts/setenv-unibuild.sh index e6fd6fe..951f707 100644 --- a/scripts/setenv-unibuild.sh +++ b/scripts/setenv-unibuild.sh @@ -75,21 +75,30 @@ setenv_linux_clang()  setenv_qt5()  { - export QTDIR=/opt/qt5 - export PATH=$QTDIR/bin:$PATH - export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH - export LD_RUN_PATH=$QTDIR/lib:$LD_RUN_PATH + if [ ! $QTDIR ]; then +  QTDIR=/opt/qt5 +  echo Please set QTDIR before running this qt5 script. Assuming $QTDIR + fi + PATH=$QTDIR/bin:$PATH + LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH + LD_RUN_PATH=$QTDIR/lib:$LD_RUN_PATH   if [ "`echo $CC | grep clang`" ]; then    if [ "`uname | grep -i linux\|debian`" ]; then -   export QMAKESPEC=linux-clang +   QMAKESPEC=linux-clang     echo QMAKESPEC has been modified: $QMAKESPEC    fi   fi + export QTDIR + export PATH + export LD_LIBRARY_PATH + export LD_RUN_PATH + export QMAKESPEC + + echo QTDIR is set to: $QTDIR   echo PATH has been modified with $QTDIR/bin   echo LD_LIBRARY_PATH has been modified with $QTDIR/lib   echo LD_RUN_PATH has been modified with $QTDIR/lib - echo QTDIR has been modified: $QTDIR  }  if [ "`uname | grep -i 'linux\|debian'`" ]; then @@ -97,9 +106,6 @@ if [ "`uname | grep -i 'linux\|debian'`" ]; then   if [ "`echo $* | grep clang`" ]; then    setenv_linux_clang   fi - if [ "`echo $* | grep qt5`" ]; then -  setenv_qt5 - fi  elif [ "`uname | grep -i freebsd`" ]; then   setenv_freebsd  elif [ "`uname | grep -i netbsd`" ]; then @@ -109,3 +115,7 @@ else   setenv_common   echo unknown system. guessed env variables. see 'setenv-unibuild.sh'  fi + +if [ "`echo $* | grep qt5`" ]; then + setenv_qt5 +fi | 
