Update gmsh package

diff --git a/candi.cfg b/candi.cfg
index 050b1a3ac2eab5ebfd479dbae2682664af6f24e3..99d66e42336494f5551958e04dcf99bc37b1f595 100644 (file)
--- a/candi.cfg
+++ b/candi.cfg
@@ -71,6 +71,7 @@ PACKAGES="load:dealii-prepare"
 #PACKAGES="${PACKAGES} once:arpack-ng"
 #PACKAGES="${PACKAGES} once:assimp"
 #PACKAGES="${PACKAGES} once:ginkgo"
+#PACKAGES="${PACKAGES} once:gmsh"
 #PACKAGES="${PACKAGES} once:gsl"
 PACKAGES="${PACKAGES} once:opencascade"
 PACKAGES="${PACKAGES} once:parmetis"

diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package
index 3f490dbe7ca0fd889bf14c916fdaa1ac461385ec..93be50396f5af72fbfbc126a95b24517fabde475 100644 (file)
--- a/deal.II-toolchain/packages/dealii.package
+++ b/deal.II-toolchain/packages/dealii.package
@@ -260,6 +260,22 @@ if [ ! -z "${SYMENGINE_DIR}" ]; then
       -D DEAL_II_WITH_SYMENGINE:BOOL=ON"
 fi
 
+########################################
+# GMSH
+if [[ ${PACKAGES_OFF} =~ 'gmsh' ]]; then
+    if [ ! -z "${GMSH_DIR}" ]; then
+        cecho ${INFO} "deal.II: unset GMSH_DIR due to forced DEAL_II_WITH_GMSH:BOOL=OFF option"
+        unset GMSH_DIR
+    fi
+fi
+
+if [ ! -z "${GMSH_DIR}" ]; then
+    cecho ${INFO} "deal.II: configuration with GMSH"
+    CONFOPTS="${CONFOPTS} \
+      -D DEAL_II_WITH_GMSH:BOOL=ON \
+      -D GMSH_DIR=${GMSH_DIR}"
+fi
+
 ################################################################################
 
 package_specific_install() {

diff --git a/deal.II-toolchain/packages/gmsh.package b/deal.II-toolchain/packages/gmsh.package
index 07655829cd80be262767e47c688c159ceda8d28b..9aa971345718863dd4b8975214d725715fe4097d 100644 (file)
--- a/deal.II-toolchain/packages/gmsh.package
+++ b/deal.II-toolchain/packages/gmsh.package
@@ -1,39 +1,63 @@
-# see http://gmsh.info/src/
-VERSION=3.0.6
-CHECKSUM=78bbfdd695b29cfef18a99f93226afc5
+################################################################################
+## GMSH                                                                       ##
+################################################################################
 
-#VERSION=2.16.0
-#CHECKSUM=762c10f159dab4b042e3140b1c348427
+# Option {ON|OFF}: Choose whether to load the tarball or the git repository.
+CANDI_GMSH_LOAD_TARBALL=ON
 
-NAME=gmsh-${VERSION}-source
-PACKING=.tgz
-SOURCE=http://gmsh.info/src/
-EXTRACTSTO=gmsh-${VERSION}-source
+if [ ${CANDI_GMSH_LOAD_TARBALL} = ON ]; then
+    # see http://gmsh.info/src/
+
+    # 2021/04/28
+    VERSION=4.8.4
+    CHECKSUM=760dbdc072eaa3c82d066c5ba3b06eacdd3304eb2a97373fe4ada9509f0b6ace
+    CHECKSUM="${CHECKSUM} 465d965d40049c00dab65a196115fe56e1d9d147"
+    CHECKSUM="${CHECKSUM} 1e7212dfb1319d745ffb477a7a3ff124"
+
+    # VERSION=3.0.6
+    # CHECKSUM=78bbfdd695b29cfef18a99f93226afc5
+
+    # VERSION=2.16.0
+    # CHECKSUM=762c10f159dab4b042e3140b1c348427
+
+    NAME=gmsh-${VERSION}-source
+    SOURCE=http://gmsh.info/src/
+    EXTRACTSTO=gmsh-${VERSION}-source
+    PACKING=.tgz
+else
+    VERSION=gmsh_4_8_4
+    NAME=gmsh.git
+    SOURCE=https://gitlab.onelab.info/gmsh/
+    EXTRACTSTO=${VERSION}
+    PACKING=git
+fi
+unset CANDI_GMSH_LOAD_TARBALL
 
 BUILDCHAIN=cmake
 
 BUILDDIR=${BUILD_PATH}/${EXTRACTSTO}
 INSTALL_PATH=${INSTALL_PATH}/gmsh-${VERSION}
 
-# Disable slepc because gmsh is not setting the relative path for the
-# .so correctly.
+# Disable slepc because gmsh is not setting the relative path for the .so
+# correctly.
 
-CONFOPTS=" -D ENABLE_MPI=OFF \
-          -D CMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE \
-          -D ENABLE_PETSC=OFF \
-          -D ENABLE_SLEPC=OFF \
-          -D CMAKE_BUILD_TYPE=Release"
+CONFOPTS="\
+  -D ENABLE_MPI:BOOL=OFF \
+  -D CMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON \
+  -D ENABLE_PETSC:BOOL=OFF \
+  -D CMAKE_BUILD_TYPE=Release"
 
-# options we might consider setting:
+# Manually-specified variables were not used by the project (v4.8.3+):
+# -D ENABLE_SLEPC:BOOL=OFF
+# Options we might consider setting:
 # -D ENABLE_METIS=OFF
 # -D ENABLE_FLTK=OFF
 # -D ENABLE_OCC=OFF
 # -D ENABLE_COMPRESSED_IO=O
-# the following two sadly don't install the .so correctly:
+# The following two sadly don't install the .so correctly:
 # -D ENABLE_BUILD_SHARED=ON
 # -D ENABLE_BUILD_DYNAMIC=ON
 
-
 package_specific_register () {
     export GMSH_DIR=${INSTALL_PATH}
     export PATH=${INSTALL_PATH}/bin:$PATH