From 61fe690d17714c950fe1e1502cb1ee60f0c0b1ba Mon Sep 17 00:00:00 2001
From: Stefan Bienert <stefan.bienert@unibas.ch>
Date: Thu, 26 Jun 2014 16:18:17 +0200
Subject: [PATCH] Activatet QMEAN
---
scripts/CMakeLists.txt | 3 ++-
scripts/pm.in | 5 +----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 9c0d1b12..dff0fb61 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,4 +1,5 @@
-set(SUBST_DICT OST_ROOT="${OST_ROOT}"
+set(SUBST_DICT OST_ROOT="${OST_ROOT}"
+ QMEAN_ROOT=${QMEAN_ROOT}
LIBDIR=${LIB_DIR}
LIBEXECPATH=${LIBEXEC_PATH}
PYTHON_VERSION=${PYTHON_VERSION})
diff --git a/scripts/pm.in b/scripts/pm.in
index d6992a94..cd5cbf8f 100755
--- a/scripts/pm.in
+++ b/scripts/pm.in
@@ -21,12 +21,9 @@ SCRIPT_NAME=$0
BIN_DIR=$( cd `dirname "$SCRIPT_NAME"`; pwd)
export PROMOD3_ROOT="$BIN_DIR/.."
PROMOD3_EXEC_PATH="$PROMOD3_ROOT/@LIBEXECPATH@"
-export PYTHONPATH="${PROMOD3_ROOT}/@LIBDIR@/python@PYTHON_VERSION@/site-packages:${PYTHONPATH}"
+export PYTHONPATH="${PROMOD3_ROOT}/@LIBDIR@/python@PYTHON_VERSION@/site-packages:@QMEAN_ROOT@/@LIBDIR@/qmean:${PYTHONPATH}"
export PATH="$BIN_DIR:@OST_ROOT@/bin:$PATH"
export LD_LIBRARY_PATH="${PROMOD3_ROOT}/@LIBDIR@:$LD_LIBRARY_PATH"
-if test -n "@QMEAN_ROOT@" ; then
- export PYTHONPATH="@QMEAN_ROOT@/@LIBDIR@/qmean:${PYTHONPATH}"
-fi
ACTION="$1"
PROMOD3_SCRIPT="${PROMOD3_EXEC_PATH}/pm-${ACTION}"
--
GitLab