From ba07931b1803d47198bd8dedb52d67650b9d610f Mon Sep 17 00:00:00 2001 From: abd Date: Fri, 20 Apr 2007 13:48:40 +0000 Subject: [PATCH] Fix compilation problems on Debian(OCC instaed CAS) and Mandriva64(CORBA CPPFLAGS) --- src/SMESHFiltersSelection/Makefile.am | 5 +++-- src/StdMeshers/Makefile.am | 2 +- src/StdMeshersGUI/Makefile.am | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/SMESHFiltersSelection/Makefile.am b/src/SMESHFiltersSelection/Makefile.am index 192973966..9d5d0ba93 100644 --- a/src/SMESHFiltersSelection/Makefile.am +++ b/src/SMESHFiltersSelection/Makefile.am @@ -56,6 +56,8 @@ libSMESHFiltersSelection_la_CPPFLAGS = \ $(PYTHON_INCLUDES) \ $(VTK_INCLUDES) \ ${BOOST_CPPFLAGS} \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ -I$(top_builddir)/idl \ -I$(top_builddir)/salome_adm/unix @@ -64,5 +66,4 @@ libSMESHFiltersSelection_la_LDFLAGS = \ $(KERNEL_LDFLAGS) -lSalomeDSClient -lSalomeDS \ $(GUI_LDFLAGS) -lSalomeApp -lsuit \ $(GEOM_LDFLAGS) -lGEOM \ - $(OCC_KERNEL_LIBS) - + $(CAS_LDPATH) -lTKernel diff --git a/src/StdMeshers/Makefile.am b/src/StdMeshers/Makefile.am index 42cb6e927..d05ea4dbb 100644 --- a/src/StdMeshers/Makefile.am +++ b/src/StdMeshers/Makefile.am @@ -124,4 +124,4 @@ libStdMeshers_la_LDFLAGS = \ ../SMESHDS/libSMESHDS.la \ ../MEFISTO2/libMEFISTO2D.la \ $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lOpUtil \ - $(OCC_LDPATH) -lTKAdvTools -lTKTopAlgo -lTKG3d + $(CAS_LDPATH) -lTKAdvTools -lTKTopAlgo -lTKG3d diff --git a/src/StdMeshersGUI/Makefile.am b/src/StdMeshersGUI/Makefile.am index 76f0ab19b..aaa37f91f 100644 --- a/src/StdMeshersGUI/Makefile.am +++ b/src/StdMeshersGUI/Makefile.am @@ -86,7 +86,7 @@ libStdMeshersGUI_la_LDFLAGS = \ ../SMESHGUI/libSMESH.la \ ../OBJECT/libSMESHObject.la \ $(GUI_LDFLAGS) -lSalomeApp \ - $(OCC_KERNEL_LIBS) -lTKBO -lTKAdvTools \ + $(CAS_LDPATH) -lTKernel -lTKBO -lTKAdvTools \ $(QWT_LIBS) # resources files -- 2.39.2