From: Uwe Köcher <koecher@hsu-hamburg.de>
Date: Wed, 7 Oct 2015 13:12:58 +0000 (+0200)
Subject: deal.II: corrected version folder to master, if unstable build is forced
X-Git-Tag: v0.7~12^2~4
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c439be4b51f359bd78eb17c30c35f527a285a0d0;p=candi.git

deal.II: corrected version folder to master, if unstable build is forced
---

diff --git a/project-deal.II.cfg b/project-deal.II.cfg
index e27e0ff..67f53b7 100644
--- a/project-deal.II.cfg
+++ b/project-deal.II.cfg
@@ -5,7 +5,6 @@
 
 # Meta-project to build
 PROJECT=deal.II
-DEAL_II_VERSION=v8.3.0
 CLEAN_BUILD=false
 
 #########################################################################
@@ -57,6 +56,21 @@ DEAL_CONFOPTS=" \
 
 #########################################################################
 
+# Install the following deal.II version:
+DEAL_II_VERSION=v8.3.0
+
+# Would you like to build stable versions of projects?
+# If STABLE_BUILD=false, then the development version of deal.II will be
+# installed.
+STABLE_BUILD=true
+#STABLE_BUILD=false
+
+if [ ${STABLE_BUILD} = "false" ]; then
+    DEAL_II_VERSION=master
+fi
+
+#########################################################################
+
 # Do you want to use MKL?
 MKL=OFF
 # BLAS_DIR=
@@ -76,9 +90,3 @@ BUILD_PATH=${PREFIX_PATH}/${PROJECT}/${DEAL_II_VERSION}-build
 # Where do you want the compiled software installed?
 INSTALL_PATH=${PREFIX_PATH}/${PROJECT}/${DEAL_II_VERSION}
 
-# Would you like to build stable versions of projects?
-# If STABLE_BUILD=false, then the development version of deal.II will be
-# installed.
-STABLE_BUILD=true
-#STABLE_BUILD=false
-