Commit 4a6ab377 authored by Mark Olesen's avatar Mark Olesen
Browse files

COMP: handle mesa library in lib64 or lib (fixes #16)

- only addresses -mesa-prefix behaviour.
  The -mesa-lib option makes no assumptions at all.

STYLE: update versions in makeParaView.example, makeVTK.example
parent 458d9dad
......@@ -200,7 +200,9 @@ do
[ "$#" -ge 2 ] || die "'$1' option requires an argument"
withMESA=true
MESA_INCLUDE="${2%%/}/include"
# Could be under (lib64 | lib)
MESA_LIBRARY="${2%%/}/lib$WM_COMPILER_LIB_ARCH/libOSMesa.so"
[ -f "$MESA_LIBRARY" ] || MESA_LIBRARY="${2%%/}/lib/libOSMesa.so"
shift
;;
-mesa-include)
......
......@@ -4,7 +4,8 @@
# - mesa
# mesa=mesa-11.2.2
mesa=mesa-13.0.3
# mesa=mesa-13.0.3
mesa=mesa-17.1.1
./makeParaView \
-mpi=0 \
......
......@@ -183,7 +183,9 @@ do
[ "$#" -ge 2 ] || die "'$1' option requires an argument"
withMESA=true
MESA_INCLUDE="${2%%/}/include"
# Could be under (lib64 | lib)
MESA_LIBRARY="${2%%/}/lib$WM_COMPILER_LIB_ARCH/libOSMesa.so"
[ -f "$MESA_LIBRARY" ] || MESA_LIBRARY="${2%%/}/lib/libOSMesa.so"
shift
;;
-mesa-include)
......
......@@ -2,9 +2,10 @@
# An example for building particular combinations of VTK with
# - mesa (off-screen only)
vtk=VTK-7.1.0
vtk=VTK-8.1.0
# mesa=mesa-11.2.2
mesa=mesa-13.0.3
# mesa=mesa-13.0.3
mesa=mesa-17.1.1
./makeVTK \
$vtk \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment