opencascade and gmsh: export CASROOT, fix libs

- opencascade support inside gmsh is needed for deal.II.
- gmsh finds opencascade using the CASROOT env variable, so export it
when we install opencascade.
- set rpath in gmsh installation to be able to find libs
- disable petsc/slepc in gmsh (not needed)

diff --git a/deal.II-toolchain/packages/gmsh.package b/deal.II-toolchain/packages/gmsh.package
index a20465e429f946140ca35871cc97a80128b0f60e..07655829cd80be262767e47c688c159ceda8d28b 100644 (file)
--- a/deal.II-toolchain/packages/gmsh.package
+++ b/deal.II-toolchain/packages/gmsh.package
@@ -2,6 +2,9 @@
 VERSION=3.0.6
 CHECKSUM=78bbfdd695b29cfef18a99f93226afc5
 
+#VERSION=2.16.0
+#CHECKSUM=762c10f159dab4b042e3140b1c348427
+
 NAME=gmsh-${VERSION}-source
 PACKING=.tgz
 SOURCE=http://gmsh.info/src/
@@ -16,6 +19,8 @@ INSTALL_PATH=${INSTALL_PATH}/gmsh-${VERSION}
 # .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"
 
@@ -23,7 +28,6 @@ CONFOPTS=" -D ENABLE_MPI=OFF \
 # -D ENABLE_METIS=OFF
 # -D ENABLE_FLTK=OFF
 # -D ENABLE_OCC=OFF
-# -D ENABLE_PETSC=OFF
 # -D ENABLE_COMPRESSED_IO=O
 # the following two sadly don't install the .so correctly:
 # -D ENABLE_BUILD_SHARED=ON

diff --git a/deal.II-toolchain/packages/opencascade.package b/deal.II-toolchain/packages/opencascade.package
index 7257b11e5704232df2340bd0224cf3d1906e6f30..595efb616ef70d0e83497d03ceb9d7eaaa608617 100644 (file)
--- a/deal.II-toolchain/packages/opencascade.package
+++ b/deal.II-toolchain/packages/opencascade.package
@@ -58,6 +58,7 @@ package_specific_patch () {
 
 package_specific_register () {
     export OPENCASCADE_DIR=${INSTALL_PATH}
+    export CASROOT=${INSTALL_PATH}
 }
 
 package_specific_conf () {
@@ -66,5 +67,6 @@ package_specific_conf () {
     rm -f $CONFIG_FILE
     echo "
 export OPENCASCADE_DIR=${INSTALL_PATH}
+export CASROOT=${INSTALL_PATH}
 " >> $CONFIG_FILE
 }