mirror of
https://develop.openfoam.com/Development/ThirdParty-common.git
synced 2025-12-08 06:57:50 +00:00
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
This commit is contained in:
@ -200,7 +200,9 @@ do
|
|||||||
[ "$#" -ge 2 ] || die "'$1' option requires an argument"
|
[ "$#" -ge 2 ] || die "'$1' option requires an argument"
|
||||||
withMESA=true
|
withMESA=true
|
||||||
MESA_INCLUDE="${2%%/}/include"
|
MESA_INCLUDE="${2%%/}/include"
|
||||||
|
# Could be under (lib64 | lib)
|
||||||
MESA_LIBRARY="${2%%/}/lib$WM_COMPILER_LIB_ARCH/libOSMesa.so"
|
MESA_LIBRARY="${2%%/}/lib$WM_COMPILER_LIB_ARCH/libOSMesa.so"
|
||||||
|
[ -f "$MESA_LIBRARY" ] || MESA_LIBRARY="${2%%/}/lib/libOSMesa.so"
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
-mesa-include)
|
-mesa-include)
|
||||||
|
|||||||
@ -4,7 +4,8 @@
|
|||||||
# - mesa
|
# - mesa
|
||||||
|
|
||||||
# mesa=mesa-11.2.2
|
# mesa=mesa-11.2.2
|
||||||
mesa=mesa-13.0.3
|
# mesa=mesa-13.0.3
|
||||||
|
mesa=mesa-17.1.1
|
||||||
|
|
||||||
./makeParaView \
|
./makeParaView \
|
||||||
-mpi=0 \
|
-mpi=0 \
|
||||||
|
|||||||
2
makeVTK
2
makeVTK
@ -183,7 +183,9 @@ do
|
|||||||
[ "$#" -ge 2 ] || die "'$1' option requires an argument"
|
[ "$#" -ge 2 ] || die "'$1' option requires an argument"
|
||||||
withMESA=true
|
withMESA=true
|
||||||
MESA_INCLUDE="${2%%/}/include"
|
MESA_INCLUDE="${2%%/}/include"
|
||||||
|
# Could be under (lib64 | lib)
|
||||||
MESA_LIBRARY="${2%%/}/lib$WM_COMPILER_LIB_ARCH/libOSMesa.so"
|
MESA_LIBRARY="${2%%/}/lib$WM_COMPILER_LIB_ARCH/libOSMesa.so"
|
||||||
|
[ -f "$MESA_LIBRARY" ] || MESA_LIBRARY="${2%%/}/lib/libOSMesa.so"
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
-mesa-include)
|
-mesa-include)
|
||||||
|
|||||||
@ -2,9 +2,10 @@
|
|||||||
# An example for building particular combinations of VTK with
|
# An example for building particular combinations of VTK with
|
||||||
# - mesa (off-screen only)
|
# - mesa (off-screen only)
|
||||||
|
|
||||||
vtk=VTK-7.1.0
|
vtk=VTK-8.1.0
|
||||||
# mesa=mesa-11.2.2
|
# mesa=mesa-11.2.2
|
||||||
mesa=mesa-13.0.3
|
# mesa=mesa-13.0.3
|
||||||
|
mesa=mesa-17.1.1
|
||||||
|
|
||||||
./makeVTK \
|
./makeVTK \
|
||||||
$vtk \
|
$vtk \
|
||||||
|
|||||||
Reference in New Issue
Block a user