Do not install libraries that have been turned off for deal.II

diff --git a/candi.sh b/candi.sh
index 4b5057ef5918319ea283efb97b4c01920476cef6..e6f4adfb1dc2fafd1a5376e5771fb5ed85f3c388 100755 (executable)
--- a/candi.sh
+++ b/candi.sh
@@ -419,6 +419,7 @@ default INSTALL_PATH=${HOME}/apps/candi/${PROJECT}
 default PROCS=1
 default STABLE_BUILD=true
 default USE_SNAPSHOTS=false
+default PACKAGES_OFF=""
 
 # Check if project was specified correctly
 if [ -d ${PROJECT} ]; then
@@ -658,7 +659,15 @@ for PACKAGE in ${PACKAGES[@]}; do
     SKIP=false
     case ${PACKAGE} in
         skip:*) SKIP=true;  PACKAGE=${PACKAGE#*:};;
-        once:*) SKIP=maybe; PACKAGE=${PACKAGE#*:};;
+        once:*) 
+          # If the package is turned off in the deal.II configuration, do not
+          # install it.
+          PACKAGE=${PACKAGE#*:};
+          if [[ ${PACKAGES_OFF} =~ ${PACKAGE} ]]; then
+            SKIP=true; 
+          else
+            SKIP=maybe;
+          fi;;
     esac
     
     # Check if the package exists

diff --git a/deal.II/platforms/supported/ubuntu15.platform b/deal.II/platforms/supported/ubuntu15.platform
index c108269855ba76ea5c8c975b55dcd59b54c339db..b908b3304da00231f4f6f612bdedcb6119964e6d 100644 (file)
--- a/deal.II/platforms/supported/ubuntu15.platform
+++ b/deal.II/platforms/supported/ubuntu15.platform
@@ -15,7 +15,6 @@
 #
 # Define the packages this platform needs
 PACKAGES=(
-#once:boost
 once:parmetis
 once:superlu_dist
 once:hdf5

diff --git a/project-deal.II.cfg b/project-deal.II.cfg
index 57520d37f8c38c29ba4409e0a4c2fe3aa4026854..6ce9e485657eedf24d06ab1f415abc96e7b64500 100644 (file)
--- a/project-deal.II.cfg
+++ b/project-deal.II.cfg
@@ -90,3 +90,32 @@ INSTALL_PATH=${PREFIX_PATH}/${PROJECT}/${COMPILER}
 # installed.
 STABLE_BUILD=true
 #STABLE_BUILD=false
+
+
+####################################
+### DO NOT MODIFY THE CODE BELOW ###
+####################################
+
+# Loop over the options in DEAL_CONFOPTS and if the package is turned off, add
+# it to the PACKAGES_OFF list.
+for PACKAGE in ${DEAL_CONFOPTS[@]}; do
+  case ${PACKAGE} in
+      *DEAL_II_WITH*:BOOL=OFF)
+      PACKAGE_NAME=${PACKAGE##*WITH_};
+      PACKAGE_NAME=${PACKAGE_NAME%%:BOOL*};
+      PACKAGES_OFF=${PACKAGE_NAME}' '${PACKAGES_OFF};;
+  esac
+done
+
+# Turn off parmetis if metis is off.
+if [[ ${PACKAGES_OFF} =~ 'METIS' ]]; then
+  PACKAGES_OFF=${PACKAGES_OFF}' PARMETIS';
+fi
+
+# Turn off SuperLU_dist of Trilinos is off.
+if [[ ${PACKAGES_OFF} =~ 'TRILINOS' ]]; then
+  PACKAGES_OFF=${PACKAGES_OFF}' SUPERLU_DIST';
+fi
+
+# Transorm upper case to lower case.
+PACKAGES_OFF=${PACKAGES_OFF,,}