Skip to content

Commit

Permalink
Merge pull request #12 from milk-org/dev-no-lapacke
Browse files Browse the repository at this point in the history
Remove lapacke library from cacao plugin
  • Loading branch information
DasVinch authored Aug 23, 2023
2 parents 90ca4ce + 533c016 commit 97f415c
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 1 deletion.
17 changes: 16 additions & 1 deletion fetch_cacao_dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@ if [ -d "plugins/cacao-src" ]; then
echo " Already installed -> pulling"
(cd plugins/cacao-src; git pull)
else
git clone -b dev https://github.com/cacao-org/cacao plugins/cacao-src
[ -d "$HOME/githubalt/cacao/.git" ] \
&& repository="file://$HOME/githubalt/cacao" branchopt= \
|| repository="https://github.com/cacao-org/cacao.git" branchopt="-b dev"
echo git clone $branchopt "$repository" plugins/cacao-src
git clone $branchopt "$repository" plugins/cacao-src
echo ""
fi

PATCHFN=patch_cacao_lapacke_optional.txt
( [ -r "./$PATCHFN" ] \
&& cd plugins/cacao-src/computeCalib/ \
&& PATCHPATH="../../../$PATCHFN" \
&& [ -r "$PATCHPATH" ] \
&& patch -s --reject-file=- -f -p 2 < "$PATCHPATH" \
&& echo "Successfully patched CACAO computeCalib/CMakeList.txt" \
|| echo "Failed to patch CACAO computeCalib/CMakeList.txt" \
|| true
)
16 changes: 16 additions & 0 deletions patch_cacao_lapacke_optional.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/computeCalib/CMakeLists.txt b/computeCalib/CMakeLists.txt
index 15b1646b..6a07c81f 100644
--- a/computeCalib/CMakeLists.txt
+++ b/computeCalib/CMakeLists.txt
@@ -44,8 +44,10 @@ set(LINKLIBS
CLIcore
milkinfo
cacaoAOloopControl
- lapacke
)
+if(NOT MKL_FOUND)
+ list(APPEND LINKLIBS lapacke)
+endif()



0 comments on commit 97f415c

Please sign in to comment.