Skip to content

Commit 6e07838

Browse files
committed
more
1 parent 26e9d55 commit 6e07838

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

mkn.sh

+6-7
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ VER_BOOST="$(mkn -G org.boost.version)"
2121

2222
THREADS="$(nproc --all)"
2323

24-
rm -rf v
25-
git clone $GIT_OPT $GIT_URL -b $GIT_BNC v --recursive
24+
[ ! -d "$CWD/viennacl" ] && git clone $GIT_OPT $GIT_URL -b $GIT_BNC viennacl --recursive
2625

2726
KLOG=3 mkn clean build -dtSa "${MKN_CXXR[@]}" -p boost
2827

29-
mkdir -p v/build
30-
cd v/build
28+
mkdir -p viennacl/build
29+
cd viennacl/build
3130
cmake -DBOOST_INCLUDEDIR=$MKN_REPO/org/boost/$VER_BOOST/b \
3231
-DBOOST_LIBRARYDIR=$MKN_REPO/org/boost/$VER_BOOST/lib \
3332
-DCMAKE_INSTALL_PREFIX=$PWD -DCMAKE_BUILD_TYPE=Release ..
@@ -38,15 +37,15 @@ make install
3837
set -e
3938

4039
cd $CWD
41-
if [ ! -f "$CWD/v/build/libviennacl/libviennacl.so" ]; then
40+
if [ ! -f "$CWD/viennacl/build/libviennacl/libviennacl.so" ]; then
4241
echo "Building viennacl failed, library not found"
4342
exit 1
4443
fi
4544

4645
rm -rf lib/*
47-
mv $CWD/v/build/libviennacl/libviennacl.so lib
46+
mv $CWD/viennacl/build/libviennacl/libviennacl.so lib
4847
rm -rf inc/*
49-
cp -r v/viennacl inc
48+
cp -r viennacl/viennacl inc
5049

5150
echo "Finished successfully"
5251
exit 0

0 commit comments

Comments
 (0)