Changeset 4212

Timestamp:

Mar 10, 2014, 10:46:24 AM (11 years ago)

Author:

ldelgass

Message:

More fixes for VTK build settings

Location:

trunk

Files:

• configure.in (modified) (2 diffs)
• gui/src/Makefile.in (modified) (2 diffs)

trunk/configure.in

@@ -195 +195 @@
 VTK_TCL_DIR=""
 
-ENABLE_VTK=no
+ENABLE_VTK=
 if test "$with_vtk" != "no" ; then
   if test "$with_vtk" != "yes" ; then
@@ -221 +221 @@
 else
   if test "${ENABLE_GUI}" = "yes" ; then
-    AC_MSG_ERROR([Rappture GUI requires VTK])
+    AC_MSG_WARN([VTK missing: Rappture GUI requires VTK for some features])
   fi
 fi

trunk/gui/src/Makefile.in

@@ -41 +41 @@
 
 INCLUDES        = -I$(srcdir) \
-                  -I$(includedir) \
-                  -I$(includedir)/vtk-$(VTK_VERSION)
+                  -I$(includedir)
 version         = @PACKAGE_VERSION@
 DEFINES         = -DPACKAGE_VERSION=\"$(version)\"
@@ -68 +67 @@
 
 ifeq ($(ENABLE_VTK),yes)
+  INCLUDES += -I$(includedir)/vtk-$(VTK_VERSION)
   OBJS += RpDicomToVtk.o
   VTK_LIB_SPEC += -lvtkIOCore-$(VTK_VERSION) -lvtkIOLegacy-$(VTK_VERSION) -lvtkIOImage-$(VTK_VERSION) -lvtkCommonCore-$(VTK_VERSION)