From: vsr <vsr@opencascade.com>
Date: Wed, 15 Oct 2008 12:55:29 +0000 (+0000)
Subject: Issue 0019994: integrate patch for compilation with cmake (from E.Adam)
X-Git-Tag: V5_1_0a3~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7c90fd1517211ffee6dc1ce4ae96657ebb5f86e2;p=modules%2Fgui.git

Issue 0019994: integrate patch for compilation with cmake (from E.Adam)
---

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
index 3764ddddc..1adc05163 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
@@ -59,7 +59,7 @@ nodist_libSalomePyQtGUI_la_SOURCES = $(MOC_FILES) $(SIP_SRC)
 libSalomePyQtGUI_la_CPPFLAGS = $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES)	\
 	$(CAS_CPPFLAGS) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS)		\
 	-DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ -DCALL_OLD_METHODS				\
-	-I$(srcdir)/../../PyInterp -I$(srcdir)/../../SalomeApp				\
+	-I$(builddir) -I$(srcdir)/../../PyInterp -I$(srcdir)/../../SalomeApp		\
 	-I$(srcdir)/../../SUIT -I$(srcdir)/../../Qtx -I$(srcdir)/../../LightApp		\
 	-I$(srcdir)/../../Plot2d -I$(srcdir)/../../OCCViewer				\
 	-I$(srcdir)/../../SalomeApp -I$(srcdir)/../../CAM -I$(srcdir)/../../STD		\
diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.am b/src/SALOME_PYQT/SalomePyQt/Makefile.am
index 9b1e6328c..67addf653 100644
--- a/src/SALOME_PYQT/SalomePyQt/Makefile.am
+++ b/src/SALOME_PYQT/SalomePyQt/Makefile.am
@@ -47,7 +47,7 @@ MOC_FILES = SalomePyQt_moc.cxx
 COMMON_CPP_FLAGS = $(QT_INCLUDES) $(QWT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES)	\
 	$(CAS_CPPFLAGS) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS)		\
 	-DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ -I$(top_builddir)/salomeadn/unix		\
-	-I$(top_builddir)/idl								\
+	-I$(srcdir) -I$(top_builddir)/idl						\
 	-I$(srcdir)/../../SUIT -I$(srcdir)/../../CAM -I$(srcdir)/../../STD		\
 	-I$(srcdir)/../../Qtx -I$(srcdir)/../../SalomeApp -I$(srcdir)/../../Event	\
 	-I$(srcdir)/../../SalomeSession -I$(srcdir)/../../LogWindow			\
diff --git a/src/SALOME_SWIG/Makefile.am b/src/SALOME_SWIG/Makefile.am
index 3d6c4878d..c708bca94 100755
--- a/src/SALOME_SWIG/Makefile.am
+++ b/src/SALOME_SWIG/Makefile.am
@@ -62,7 +62,7 @@ salomeinclude_HEADERS = $(SWIG_SOURCES) SALOMEGUI_Swig.hxx SALOMEGUI_Swig.i
 _libSALOME_Swig_la_CPPFLAGS = \
 	$(QT_INCLUDES) $(QWT_INCLUDES) $(PYTHON_INCLUDES) $(CAS_CPPFLAGS) $(VTK_INCLUDES)	\
 	$(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@			\
-	-I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl					\
+	-I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl -I$(srcdir) 			\
 	-I$(srcdir)/../SalomeApp -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT				\
 	-I$(srcdir)/../ObjBrowser -I$(srcdir)/../LightApp -I$(srcdir)/../SOCC			\
 	-I$(srcdir)/../SVTK -I$(srcdir)/../Event -I$(srcdir)/../OBJECT				\