Merge pull request #52 from gambhiro/fixes

test for different CL and GL paths
This commit is contained in:
Matt Feemster 2016-01-24 09:52:16 -08:00
commit 2ba1a235e2
2 changed files with 22 additions and 2 deletions

View File

@ -23,14 +23,28 @@ if [[ ! -e $linkpath && -e $targetpath ]]; then
ln -s "$targetpath" "$linkpath"
fi
targetpath=$(ls -d1 /usr/include/*/GL | head -n 1)
targetpath=""
if [ -d /usr/include/*/GL ]; then
targetpath=$(ls -d1 /usr/include/*/GL | head -n 1)
elif [ -d /usr/include/GL ]; then
targetpath="/usr/include/GL"
fi
linkpath="$LOCAL_INCLUDE_DIR/GL"
if [[ ! -e $linkpath && -e $targetpath ]]; then
ln -s "$targetpath" "$linkpath"
fi
targetpath=$(ls -d1 /usr/include/*/CL | head -n 1)
targetpath=""
if [ -d /usr/include/*/CL ]; then
targetpath=$(ls -d1 /usr/include/*/CL | head -n 1)
elif [ -d /usr/include/CL ]; then
targetpath="/usr/include/CL"
fi
linkpath="$LOCAL_INCLUDE_DIR/CL"
if [[ ! -e $linkpath && -e $targetpath ]]; then

View File

@ -21,6 +21,12 @@ Install the OpenCL drivers and opencl support for your hardware. For Nvidia:
sudo apt-get install nvidia-352 nvidia-352-dev nvidia-opencl-icd-352 nvidia-libopencl1-352 nvidia-prime nvidia-modprobe
```
If you have both Qt 4 and 5 installed, select Qt 5 before compilation:
```
export QT_SELECT=qt5
```
Compile the binary:
```