Rename to DEAL_II_CONFOPTS

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8e36095e0189aae7907326a5623fa4f107a085e2..bbd98fb1bc946bd54cfdfa9b477cafbc107063ec 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
         cmake --version
     - name: build
       run: |
-        echo 'DEAL_CONFOPTS="-D CMAKE_BUILD_TYPE=Debug"' >> candi.cfg
+        echo 'DEAL_II_CONFOPTS="-D CMAKE_BUILD_TYPE=Debug"' >> candi.cfg
         ./candi.sh -j 2 --packages="once:p4est dealii"
         cd ~/deal.ii-candi/tmp/build/deal.II-* && cat detailed.log && make test
 
@@ -61,7 +61,7 @@ jobs:
         cmake --version
     - name: build
       run: |
-        echo 'DEAL_CONFOPTS="-D CMAKE_BUILD_TYPE=Debug"' >> candi.cfg
+        echo 'DEAL_II_CONFOPTS="-D CMAKE_BUILD_TYPE=Debug"' >> candi.cfg
         ./candi.sh -j 2 --packages="dealii"
         cd ~/deal.ii-candi/tmp/build/deal.II-* && cat detailed.log && make test
 
@@ -87,6 +87,6 @@ jobs:
         export OMPI_CXX=g++-9
         export OMPI_CC=gcc-9
         export OMPI_FC=gfortran-9
-        echo 'DEAL_CONFOPTS="-D CMAKE_BUILD_TYPE=Debug"' >> candi.cfg
+        echo 'DEAL_II_CONFOPTS="-D CMAKE_BUILD_TYPE=Debug"' >> candi.cfg
         ./candi.sh -j 2 --packages="once:p4est once:petsc dealii"
         cd ~/deal.ii-candi/tmp/build/deal.II-* && cat detailed.log && make test

diff --git a/candi.cfg b/candi.cfg
index b9e9dabb00c584bf638fc5cefb3935e14f4e7069..ee969b001859f93ddd9fe495d37cd25df06544b5 100644 (file)
--- a/candi.cfg
+++ b/candi.cfg
@@ -28,7 +28,7 @@ MIRROR="https://tjhei.info/candi-mirror/ https://cecas.clemson.edu/dealii/mirror
 
 #########################################################################
 # Choose additional configuration and components of deal.II
-DEAL_CONFOPTS=""
+DEAL_II_CONFOPTS=""
 
 # Option {ON|OFF}: Enable machine-specific optimizations (e.g. -march=native)?
 NATIVE_OPTIMIZATIONS=OFF

diff --git a/deal.II-toolchain/packages/dealii-prepare.package b/deal.II-toolchain/packages/dealii-prepare.package
index 9dd2d452ba3d0601c18221b15d62d91b850bce9d..e03bcffc89294ed8935461b462bfc52eeab1e60e 100644 (file)
--- a/deal.II-toolchain/packages/dealii-prepare.package
+++ b/deal.II-toolchain/packages/dealii-prepare.package
@@ -2,9 +2,9 @@ NAME=dealii-prepare
 BUILDCHAIN=ignore
 
 ################################################################################
-# Loop over the options in DEAL_CONFOPTS and if the package is turned off, add
-# it to the PACKAGES_OFF list.
-for option in ${DEAL_CONFOPTS[@]}; do
+# Loop over the options in DEAL_II_CONFOPTS and if the package is turned off,
+# add it to the PACKAGES_OFF list.
+for option in ${DEAL_II_CONFOPTS[@]}; do
     case ${option} in
         *DEAL_II_WITH*:BOOL=OFF)
         PACKAGE_NAME=${option##*WITH_};
@@ -20,7 +20,7 @@ PACKAGES_OFF=`echo "$PACKAGES_OFF" | tr '[:upper:]' '[:lower:]'`
 
 if [ ! -z "${PACKAGES_OFF}" ]; then
     cecho ${WARN} "deal.II: forcing package skip for: ${PACKAGES_OFF}"
-    cecho ${INFO} "This is coming from your personal DEAL_CONFOPTS settings!"
+    cecho ${INFO} "This is coming from your personal DEAL_II_CONFOPTS settings!"
     echo
     cecho ${GOOD} "Please confirm this behaviour by pressing enter..."
     read

diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package
index 2f24ef5f3d99ad44d7df131d6d00d8b5ce731864..0ea6e4d64080392856fe56501293f7cb40b45cf4 100644 (file)
--- a/deal.II-toolchain/packages/dealii.package
+++ b/deal.II-toolchain/packages/dealii.package
@@ -43,7 +43,7 @@ fi
 
 # add the user-specified flags at the end (so things can be overriden):
 CONFOPTS="${CONFOPTS} \
-${DEAL_CONFOPTS}"
+${DEAL_II_CONFOPTS}"
 
 
 ################################################################################
@@ -89,7 +89,7 @@ fi
 
 # metis
 if [[ ${PACKAGES_OFF} =~ 'metis' ]]; then
-    # Disable METIS for deal.II, if a special DEAL_CONFOPTS together with
+    # Disable METIS for deal.II, if a special DEAL_II_CONFOPTS together with
     # the dealii-prepare loop forces metis to be off
     if [ ! -z "${METIS_DIR}" ]; then
         cecho ${INFO} "deal.II: unset METIS_DIR due to forced DEAL_II_WITH_METIS:BOOL=OFF option"
@@ -115,7 +115,7 @@ fi
 
 # p4est
 if [[ ${PACKAGES_OFF} =~ 'p4est' ]]; then
-    # Disable p4est for deal.II, if a special DEAL_CONFOPTS together with
+    # Disable p4est for deal.II, if a special DEAL_II_CONFOPTS together with
     # the dealii-prepare loop forces p4est to be off
     if [ ! -z "${P4EST_DIR}" ]; then
         cecho ${INFO} "deal.II: unset P4EST_DIR due to forced DEAL_II_WITH_P4EST:BOOL=OFF option"
@@ -133,7 +133,7 @@ fi
 
 # hdf5
 if [[ ${PACKAGES_OFF} =~ 'hdf5' ]]; then
-    # Disable hdf5 for deal.II, if a special DEAL_CONFOPTS together with
+    # Disable hdf5 for deal.II, if a special DEAL_II_CONFOPTS together with
     # the dealii-prepare loop forces hdf5 to be off
     if [ ! -z "${HDF5_DIR}" ]; then
         cecho ${INFO} "deal.II: unset HDF5_DIR due to forced DEAL_II_WITH_HDF5:BOOL=OFF option"
@@ -151,7 +151,7 @@ fi
 
 # trilinos
 if [[ ${PACKAGES_OFF} =~ 'trilinos' ]]; then
-    # Disable trilinos for deal.II, if a special DEAL_CONFOPTS together with
+    # Disable trilinos for deal.II, if a special DEAL_II_CONFOPTS together with
     # the dealii-prepare loop forces trilinos to be off
     if [ ! -z "${TRILINOS_DIR}" ]; then
         cecho ${INFO} "deal.II: unset TRILINOS_DIR due to forced DEAL_II_WITH_TRILINOS:BOOL=OFF option"
@@ -169,7 +169,7 @@ fi
 
 # petsc
 if [[ ${PACKAGES_OFF} =~ 'petsc' ]]; then
-    # Disable petsc for deal.II, if a special DEAL_CONFOPTS together with
+    # Disable petsc for deal.II, if a special DEAL_II_CONFOPTS together with
     # the dealii-prepare loop forces petsc to be off
     if [ ! -z "${PETSC_DIR}" ]; then
         cecho ${INFO} "deal.II: unset PETSC_DIR due to forced DEAL_II_WITH_PETSC:BOOL=OFF option"
@@ -187,7 +187,7 @@ fi
 
 # slepc
 if [[ ${PACKAGES_OFF} =~ 'slepc' ]]; then
-    # Disable slepc for deal.II, if a special DEAL_CONFOPTS together with
+    # Disable slepc for deal.II, if a special DEAL_II_CONFOPTS together with
     # the dealii-prepare loop forces slepc to be off
     if [ ! -z "${SLEPC_DIR}" ]; then
         cecho ${INFO} "deal.II: unset SLEPC_DIR due to forced DEAL_II_WITH_SLEPC:BOOL=OFF option"
@@ -205,7 +205,7 @@ fi
 
 # opencascade
 if [[ ${PACKAGES_OFF} =~ 'opencascade' ]]; then
-    # Disable OPENCASCADE for deal.II, if a special DEAL_CONFOPTS together with
+    # Disable OPENCASCADE for deal.II, if a special DEAL_II_CONFOPTS together with
     # the dealii-prepare loop forces opencascade to be off
     if [ ! -z "${OPENCASCADE_DIR}" ]; then
         cecho ${INFO} "deal.II: unset OPENCASCADE_DIR due to forced DEAL_II_WITH_OPENCASCADE:BOOL=OFF option"

diff --git a/deal.II-toolchain/packages/openblas.package b/deal.II-toolchain/packages/openblas.package
index dad0fbdf9cf16c796f548bc5cd63477d5d0e25d7..00a343efd5c285cf54bea96d1053620a33d3be49 100644 (file)
--- a/deal.II-toolchain/packages/openblas.package
+++ b/deal.II-toolchain/packages/openblas.package
@@ -33,7 +33,7 @@ package_specific_register () {
     export BLAS_LIB=${INSTALL_PATH}/lib/libopenblas.${LDSUFFIX}
     # older cmake (for example 3.5) does not detect openblas by default so
     # we force detection by adding to the deal.II configure line:
-    export DEAL_CONFOPTS="-D LAPACK_FOUND=true -D LAPACK_LIBRARIES=${INSTALL_PATH}/lib/libopenblas.${LDSUFFIX} ${DEAL_CONFOPTS}"
+    export DEAL_II_CONFOPTS="-D LAPACK_FOUND=true -D LAPACK_LIBRARIES=${INSTALL_PATH}/lib/libopenblas.${LDSUFFIX} ${DEAL_II_CONFOPTS}"
 }
 
 package_specific_conf () {

diff --git a/deal.II-toolchain/platforms/contributed/cray.platform b/deal.II-toolchain/platforms/contributed/cray.platform
index 5cdfb76964df330f41ad5b85d774b1426c9a807f..b078096756bfca07ce90c5a4d20711b2afec20ee 100644 (file)
--- a/deal.II-toolchain/platforms/contributed/cray.platform
+++ b/deal.II-toolchain/platforms/contributed/cray.platform
@@ -32,7 +32,7 @@ TRILINOS_CONFOPTS=" \
 -D LAPACK_INCLUDE_DIRS=$CRAY_LIBSCI_PREFIX_DIR/include \
 -D LAPACK_LIBRARY_NAMES=sci_gnu"
 
-DEAL_CONFOPTS=" \
+DEAL_II_CONFOPTS=" \
 -D DEAL_II_COMPILER_HAS_FUSE_LD_GOLD=OFF \
 -D DEAL_II_WITH_LAPACK=OFF \
 -D DEAL_II_WITH_BLAS=OFF \