From b363c63d44eef05a06f8f7ff7c471ac4392cc4e9 Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Wed, 11 Nov 2020 05:29:12 +0100 Subject: Support for ufo & jupyter notebooks --- build/setup/build/cmake.sh | 2 +- build/setup/build/python.sh | 2 +- build/setup/repos.sh | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'build/setup') diff --git a/build/setup/build/cmake.sh b/build/setup/build/cmake.sh index 09beccf..1065907 100644 --- a/build/setup/build/cmake.sh +++ b/build/setup/build/cmake.sh @@ -4,6 +4,6 @@ set -o errexit pypath=$(python3 -c 'import site; print(site.getsitepackages()[0])') #rm CMakeCache.txt -cmake -D "PYTHON_DEST_DIR:PATH=$pypath" . +cmake -DCMAKE_INSTALL_PREFIX=/usr -D "PYTHON_DEST_DIR:PATH=$pypath" . make make install diff --git a/build/setup/build/python.sh b/build/setup/build/python.sh index de08a2c..3694a98 100644 --- a/build/setup/build/python.sh +++ b/build/setup/build/python.sh @@ -3,7 +3,7 @@ set -o errexit ( - cd Wrappers/Python + [ -d "Wrappers/Python" ] && cd "Wrappers/Python" python3 setup.py install ) diff --git a/build/setup/repos.sh b/build/setup/repos.sh index 92c1a2f..0c7481a 100644 --- a/build/setup/repos.sh +++ b/build/setup/repos.sh @@ -20,6 +20,12 @@ repos_ccpi=( \ "https://github.com/vais-ral/CCPi-Regularisation-Toolkit.git master ccpi.sh" \ ) +repos_ufo=( \ + "https://github.com/ufo-kit/ufo-core.git master cmake.sh" \ + "https://github.com/ufo-kit/ufo-filters.git master cmake.sh" \ + "https://github.com/ufo-kit/tofu master python.sh" \ +) + repos_all=("${repos_astra[@]}" "${repos_ccpi[@]}") declare -n repos="repos_$repo_group" -- cgit v1.2.3