mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

- Fix build with new vtk

Browse Source 
Submitted by:	Stas Timokhin <devel@stasyan.com>
This commit is contained in:
Pav Lucistnik 2010-06-18 09:17:59 +00:00
parent d3a92693cd
commit 5ea5235d79
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=256653
2 changed files with 65 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
cad/salome-gui/files/patch-GUI_check_vtk.m4
View File

@ -1,6 +1,6 @@
--- adm_local/unix/config_files/check_vtk.m4.orig 2009-08-15 21:43:12.000000000 +0700
+++ adm_local/unix/config_files/check_vtk.m4 2009-08-15 21:43:20.000000000 +0700
@@ -91,7 +91,7 @@
--- adm_local/unix/config_files/check_vtk.m4.orig 2009-12-01 20:59:03.000000000 +0600
+++ adm_local/unix/config_files/check_vtk.m4 2010-06-18 14:18:42.000000000 +0700
@@ -94,18 +94,18 @@
if test -z $vtk_suffix ; then
vtk_suffix="yes"
fi
@ -9,3 +9,63 @@
dnl in case user wrote --with-vtk-version=no, use empty suffix
vtk_suffix=""
fi
-if test "x$vtk_suffix" != "xyes" ; then
- VTKSUFFIX="$vtk_suffix"
-else
- dnl in case user wrote --with-vtk-version=yes, get the suffix from env
- if test -z $VTKSUFFIX ; then
- VTKSUFFIX="-5.0"
- fi
-fi
+#if test "x$vtk_suffix" != "xyes" ; then
+# VTKSUFFIX="$vtk_suffix"
+#else
+# dnl in case user wrote --with-vtk-version=yes, get the suffix from env
+# if test -z $VTKSUFFIX ; then
+# VTKSUFFIX="-5.0"
+# fi
+#fi
dnl VTK install dir
if test -z $with_vtk ; then
@@ -121,9 +121,9 @@
AC_MSG_WARN(Value "no", specified for option --with-vtk, is not supported)
fi
-if test "x$with_vtk" != "x" ; then
- VTKHOME="$with_vtk"
-else
+#if test "x$with_vtk" != "x" ; then
+# VTKHOME="$with_vtk"
+#else
if test -z $VTKHOME ; then
AC_MSG_WARN(undefined VTKHOME variable which specify where vtk was compiled)
for d in /usr/local /usr ; do
@@ -144,6 +144,18 @@
VTKSUFFIX="-5.2"
break
fi
+ if test -f ${d}/include/vtk-5.4/vtkPlane.h ; then
+ AC_MSG_RESULT(trying ${d})
+ VTKHOME="${d}"
+ VTKSUFFIX="-5.4"
+ break
+ fi
+ if test -f ${d}/include/vtk-5.6/vtkPlane.h ; then
+ AC_MSG_RESULT(trying ${d})
+ VTKHOME="${d}"
+ VTKSUFFIX="-5.6"
+ break
+ fi
if test -f ${d}/include/vtk/vtkPlane.h ; then
AC_MSG_RESULT(trying ${d})
VTKHOME="${d}"
@@ -152,7 +164,7 @@
fi
done
fi
-fi
+#fi
# Using regular VTK installation
if test "x$with_paraview" = "x" ; then

3
cad/salome/Makefile.ext
View File

@ -164,7 +164,8 @@ CONFIGURE_ARGS+= --with-qsci4-libraries=${QT_LIBDIR} --with-qsci4-includes=${QT_
#Dependency from vtk
.if !${SAL_MODULE} == "kernel" && !${SAL_MODULE} == "randomizer"
LIB_DEPENDS+= vtkCommon.5:${PORTSDIR}/math/vtk5
CONFIGURE_ENV+= VTKHOME=${LOCALBASE} VTKSUFFIX=-5.4
CONFIGURE_ARGS+= --with-vtk=${LOCALBASE}
#CONFIGURE_ENV+= VTKHOME=${LOCALBASE}
.endif
#Dependency from qwt5