Changeset 34388


Ignore:
Timestamp:
09/15/20 15:14:05 (8 months ago)
Author:
davidb
Message:

Work with virtual-env if present; assume python to use is on path

File:
1 edited

Legend:

Unmodified
Added
Removed
  • gs3-extensions/mars-src/trunk/packages/CASCADE-MAKE/ESSENTIA.sh

    r34347 r34388  
    88source ../cascade-make/lib/cascade-lib.bash GEXT_MARS ../.. $*
    99
    10 prefix=$GEXT_MARS_INSTALLED
     10if [ "x$VIRTUAL_ENV" != "x" ] ; then
     11    prefix="$VIRTUAL_ENV"
     12else
     13    prefix="$GEXT_MARS_INSTALLED"
     14fi
    1115
    1216opt_run_untar $force_untar $auto_untar $package $version
     
    1923    ( cd $package$version ; \
    2024      # Do full configure with testing (note: needs full recursive git cloned version of repository to provide models and sample audio files)
    21       echo ./waf configure --build-static --with-python --with-cpptests --with-examples --python=/usr/local/bin/python3 --prefix="$prefix" $@ ; \
    22       eval ./waf configure --build-static --with-python --with-cpptests --with-examples --python=/usr/local/bin/python3 --prefix="$prefix" $@ ; )
     25      echo ./waf configure --build-static --with-python --with-cpptests --with-examples --prefix="$prefix" $@ ; \
     26      eval ./waf configure --build-static --with-python --with-cpptests --with-examples --prefix="$prefix" $@ ; )
    2327    if [ $? != 0 ] ; then
    2428        echo "      Error encountered running *configure* stage of $progname"
Note: See TracChangeset for help on using the changeset viewer.