summaryrefslogtreecommitdiffstats
path: root/build/setup
diff options
context:
space:
mode:
Diffstat (limited to 'build/setup')
-rw-r--r--build/setup/build/ccpi.sh3
-rw-r--r--build/setup/repos.sh3
2 files changed, 5 insertions, 1 deletions
diff --git a/build/setup/build/ccpi.sh b/build/setup/build/ccpi.sh
index 329fbdf..65dc0ef 100644
--- a/build/setup/build/ccpi.sh
+++ b/build/setup/build/ccpi.sh
@@ -10,4 +10,7 @@ set -o errexit
[ -f CMakeLists.txt ] && bash "$script_path/cmake.sh"
[ -d Wrappers/Python ] && bash "$script_path/python.sh"
+# Hack for CCPi-regularization-toolkit
+[ -d src/Core ] && make -C src/Core install
+
exit 0
diff --git a/build/setup/repos.sh b/build/setup/repos.sh
index 0c7481a..208ba3e 100644
--- a/build/setup/repos.sh
+++ b/build/setup/repos.sh
@@ -35,12 +35,13 @@ function install_repo {
branch="$2"
script="$3"
- [ -d "$name" ] || git clone "$repo"
+ [ -d "$name" ] || git clone --recurse-submodules "$repo"
(
cd "$name"
git pull origin "$branch"
git checkout "$branch"
+ git submodule update --recursive --remote
bash "$setup_path/build/$script"
ln -sf "$setup_path/build/$script" ands_install.sh
)