handle tbb library path like .../tbb/lib/intel64/gcc4.8 (#12611)
This commit is contained in:
parent
5d31a27f57
commit
de4ffb00c3
@ -45,24 +45,36 @@ if [ -e "$INSTALLDIR/runtime" ]; then
|
|||||||
if [ -e "$HDDL_UNITE_DIR" ]; then
|
if [ -e "$HDDL_UNITE_DIR" ]; then
|
||||||
export LD_LIBRARY_PATH=$HDDL_UNITE_DIR/lib:$HDDL_UNITE_DIR/thirdparty/XLink/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
|
export LD_LIBRARY_PATH=$HDDL_UNITE_DIR/lib:$HDDL_UNITE_DIR/thirdparty/XLink/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -e "$INSTALLDIR/runtime/3rdparty/tbb" ]; then
|
if [ -e "$INSTALLDIR/runtime/3rdparty/tbb" ]; then
|
||||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
tbb_lib_path=$INSTALLDIR/runtime/3rdparty/tbb/lib
|
||||||
export DYLD_LIBRARY_PATH=$INSTALLDIR/runtime/3rdparty/tbb/lib:${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}
|
if [ -d $tbb_lib_path/$system_type ]; then
|
||||||
fi
|
lib_path=$(find $tbb_lib_path/$system_type -name "libtbb*" | sort -r | head -n1)
|
||||||
export LD_LIBRARY_PATH=$INSTALLDIR/runtime/3rdparty/tbb/lib:${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH}
|
if [ -n $lib_path ]; then
|
||||||
|
tbb_lib_path=$(dirname $lib_path)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -e "$INSTALLDIR/runtime/3rdparty/tbb/lib/cmake/TBB" ]; then
|
if ls $tbb_lib_path/libtbb* >/dev/null 2>&1; then
|
||||||
export TBB_DIR=$INSTALLDIR/runtime/3rdparty/tbb/lib/cmake/TBB
|
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||||
elif [ -e "$INSTALLDIR/runtime/3rdparty/tbb/lib/cmake/tbb" ]; then
|
export DYLD_LIBRARY_PATH=$tbb_lib_path:${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}
|
||||||
export TBB_DIR=$INSTALLDIR/runtime/3rdparty/tbb/lib/cmake/tbb
|
fi
|
||||||
elif [ -e "$INSTALLDIR/runtime/3rdparty/tbb/lib64/cmake/TBB" ]; then
|
export LD_LIBRARY_PATH=$tbb_lib_path:${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH}
|
||||||
export TBB_DIR=$INSTALLDIR/runtime/3rdparty/tbb/lib64/cmake/TBB
|
else
|
||||||
elif [ -e "$INSTALLDIR/runtime/3rdparty/tbb/cmake" ]; then
|
echo "[setupvars.sh] WARNING: Directory with TBB libraries is not detected. Please, add TBB libraries to LD_LIBRARY_PATH / DYLD_LIBRARY_PATH manually"
|
||||||
export TBB_DIR=$INSTALLDIR/runtime/3rdparty/tbb/cmake
|
fi
|
||||||
else
|
|
||||||
echo "TBB_DIR directory is not defined automatically by setupvars.sh. Please, set it manually to point to TBBConfig.cmake"
|
if [ -e "$INSTALLDIR/runtime/3rdparty/tbb/lib/cmake/TBB" ]; then
|
||||||
|
export TBB_DIR=$INSTALLDIR/runtime/3rdparty/tbb/lib/cmake/TBB
|
||||||
|
elif [ -e "$INSTALLDIR/runtime/3rdparty/tbb/lib/cmake/tbb" ]; then
|
||||||
|
export TBB_DIR=$INSTALLDIR/runtime/3rdparty/tbb/lib/cmake/tbb
|
||||||
|
elif [ -e "$INSTALLDIR/runtime/3rdparty/tbb/lib64/cmake/TBB" ]; then
|
||||||
|
export TBB_DIR=$INSTALLDIR/runtime/3rdparty/tbb/lib64/cmake/TBB
|
||||||
|
elif [ -e "$INSTALLDIR/runtime/3rdparty/tbb/cmake" ]; then
|
||||||
|
export TBB_DIR=$INSTALLDIR/runtime/3rdparty/tbb/cmake
|
||||||
|
else
|
||||||
|
echo "[setupvars.sh] WARNING: TBB_DIR directory is not defined automatically by setupvars.sh. Please, set it manually to point to TBBConfig.cmake"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user