0021063: [CEA 434] Compilation using gnu compiler v4.5

diff --git a/adm_local/unix/config_files/check_vtk.m4 b/adm_local/unix/config_files/check_vtk.m4
index 5a07570e4a2cd45644c9a6edc056cfc96e1d57ca..97dd12088c484579256f1213b93942655395c24d 100644 (file)
--- a/adm_local/unix/config_files/check_vtk.m4
+++ b/adm_local/unix/config_files/check_vtk.m4
@@ -300,7 +300,7 @@ if test "$try_regular_vtk" = "yes"; then
   VTK_LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk${VTKSUFFIX} $LOCAL_LIBS"
   VTK_TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX} -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk${VTKSUFFIX} $TRY_LINK_LIBS"
   if test "x$VTKHOME" != "x/usr" ; then
-    VTK_LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX} $LOCAL_LIBS"
+    VTK_LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk${VTKSUFFIX} $LOCAL_LIBS"
   fi
   
   dnl vtk headers

diff --git a/src/SUITApp/Makefile.am b/src/SUITApp/Makefile.am
index 30e2e8264431e956dd8eff304917610c02923b4c..cd3632cb1d8aeebbf76f4510d7adf0bd4391a0ad 100644 (file)
--- a/src/SUITApp/Makefile.am
+++ b/src/SUITApp/Makefile.am
@@ -80,7 +80,10 @@ if ENABLE_TESTRECORDER
   SUITApp_CPPFLAGS+= -DENABLE_TESTRECORDER $(TESTRECORDER_INCLUDES)
 endif
 
-SUITApp_LDADD    = libSUITApp.la  ../Qtx/libqtx.la ../SUIT/libsuit.la ../Style/libSalomeStyle.la
+SUITApp_LDADD    = libSUITApp.la  ../Qtx/libqtx.la ../SUIT/libsuit.la ../Style/libSalomeStyle.la ${QT_LIBS}
+if ENABLE_PYCONSOLE
+  SUITApp_LDADD += $(PYTHON_LIBS)
+endif
 
 if ENABLE_TESTRECORDER
   SUITApp_LDADD+= $(TESTRECORDER_LIBS)

diff --git a/src/SVTK/SVTK_InteractorStyle.h b/src/SVTK/SVTK_InteractorStyle.h
index 51bb52657bb64af18e714aa6ce37f77ea4927c07..db3b76cd58a8b635d02c90ba4c7ffdf569369702 100644 (file)
--- a/src/SVTK/SVTK_InteractorStyle.h
+++ b/src/SVTK/SVTK_InteractorStyle.h
@@ -159,7 +159,7 @@ class SVTK_EXPORT SVTK_InteractorStyle: public vtkInteractorStyle
 
   typedef boost::shared_ptr<SVTK_SelectionEvent> PSelectionEvent;
 
-  
+  void SetTDxStyle(vtkTDxInteractorStyle*){} 
 
   //! Generate special #SVTK_SelectionEvent
   virtual SVTK_SelectionEvent* GetSelectionEvent();

diff --git a/src/VTKViewer/VTKViewer_InteractorStyle.h b/src/VTKViewer/VTKViewer_InteractorStyle.h
index ec778ed5d04c0dad644c08ea332700f4e2cec996..4b24412434c76aa4c02a095de70d7ae5627bcdc6 100644 (file)
--- a/src/VTKViewer/VTKViewer_InteractorStyle.h
+++ b/src/VTKViewer/VTKViewer_InteractorStyle.h
@@ -150,6 +150,7 @@ class VTKVIEWER_EXPORT VTKViewer_InteractorStyle : public QObject, public vtkInt
   void startRotate();
   void startFitArea();
   void startSpin();
+  void SetTDxStyle(vtkTDxInteractorStyle *tdxStyle) {}
   bool needsRedrawing();
 
  protected: