From dd4c450877fc1583d4c4f8c7da05350bf7d81e17 Mon Sep 17 00:00:00 2001
From: Gerardo Tauriello <gerardo.tauriello@unibas.ch>
Date: Wed, 27 Sep 2017 15:19:19 +0200
Subject: [PATCH] Removed ancient QMEAN dependency from conf-scripts
(untested).
---
conf-scripts/fedora-19-conf | 10 +++-------
conf-scripts/osx-11.4.2-conf | 10 +++-------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/conf-scripts/fedora-19-conf b/conf-scripts/fedora-19-conf
index e3929a2d..a6f71d25 100755
--- a/conf-scripts/fedora-19-conf
+++ b/conf-scripts/fedora-19-conf
@@ -7,23 +7,20 @@
function usage
{
echo 'usage:'
- echo ' fedora-19-conf <OST_ROOT> <QMEAN_ROOT> [OPTIONS]'
+ echo ' fedora-19-conf <OST_ROOT> [OPTIONS]'
echo ' OST_ROOT is the staging directory of OST.'
- echo ' QMEAN_ROOT is the staging directory of QMEAN.'
echo ' Valid options are anything that CMake accepts.'
exit
}
NUM_PARAMS=$#
-if [[ "$NUM_PARAMS" -lt "2" ]] ; then
- echo 'You must specify the locations of OST and QMEAN (in that order).';
+if [[ "$NUM_PARAMS" -lt "1" ]] ; then
+ echo 'You must specify the locations of OST.';
usage
fi
OST_ROOT=$(cd $1; pwd)
shift
-QMEAN_ROOT=$(cd $1; pwd)
-shift
PROMOD3_SRC=$(cd `dirname $0`; pwd)
# Going up one level is intentionally, please go out of source. Just create a
# directory at your repository root, prefixed 'build'. Change into it and call
@@ -31,7 +28,6 @@ PROMOD3_SRC=$(cd `dirname $0`; pwd)
PROMOD3_SRC=${PROMOD3_SRC}/..
cmake $PROMOD3_SRC -DOST_ROOT=$OST_ROOT \
- -DQMEAN_ROOT=$QMEAN_ROOT \
-DPYTHON_ROOT=/usr \
$@
diff --git a/conf-scripts/osx-11.4.2-conf b/conf-scripts/osx-11.4.2-conf
index ad697a82..020730b3 100755
--- a/conf-scripts/osx-11.4.2-conf
+++ b/conf-scripts/osx-11.4.2-conf
@@ -9,23 +9,20 @@
function usage
{
echo 'usage:'
- echo ' osx-11.4.2-conf <OST_ROOT> <QMEAN_ROOT> [OPTIONS]'
+ echo ' osx-11.4.2-conf <OST_ROOT> [OPTIONS]'
echo ' OST_ROOT is the staging directory of OST.'
- echo ' QMEAN_ROOT is the staging directory of QMEAN.'
echo ' Valid options are anything that CMake accepts.'
exit
}
NUM_PARAMS=$#
-if [[ "$NUM_PARAMS" -lt "2" ]] ; then
- echo 'You must specify the location of OST and QMEAN (in that order).';
+if [[ "$NUM_PARAMS" -lt "1" ]] ; then
+ echo 'You must specify the locations of OST.';
usage
fi
OST_ROOT=$(cd $1; pwd)
shift
-QMEAN_ROOT=$(cd $1; pwd)
-shift
PROMOD3_SRC=$(cd `dirname $0`; pwd)
# Going up one level is intentionally, please go out of source. Just create a
# directory at your repository root, prefixed 'build'. Change into it and call
@@ -33,7 +30,6 @@ PROMOD3_SRC=$(cd `dirname $0`; pwd)
PROMOD3_SRC=${PROMOD3_SRC}/..
cmake $PROMOD3_SRC -DOST_ROOT=$OST_ROOT \
- -DQMEAN_ROOT=$QMEAN_ROOT \
-DPYTHON_ROOT=/opt/local \
-DBOOST_ROOT=/opt/local \
-DPYTHON_INCLUDE_PATH=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7/ \
--
GitLab