Merge from BR_new_bop3

This commit is contained in:
vsr 2013-09-03 15:48:30 +00:00
parent 8a85c65b1e
commit 87cc5abd48
2 changed files with 2 additions and 3 deletions

View File

@ -96,5 +96,4 @@ libSMESHimpl_la_LDFLAGS = \
../SMESHUtils/libSMESHUtils.la \ ../SMESHUtils/libSMESHUtils.la \
$(BOOST_LIB_THREAD) \ $(BOOST_LIB_THREAD) \
$(BOOST_LIB_SYSTEM) \ $(BOOST_LIB_SYSTEM) \
$(GEOM_LDFLAGS) -lNMTTools \ $(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d -lTKCDF
$(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d -lTKCDF

View File

@ -72,7 +72,7 @@ libSMESHClient_la_LDFLAGS = \
$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics -lSalomeContainer -lSalomeHDFPersist -lSalomeGenericObj \ $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics -lSalomeContainer -lSalomeHDFPersist -lSalomeGenericObj \
-lRegistry -lResourcesManager -lSalomeResourcesManager -lSalomeNotification \ -lRegistry -lResourcesManager -lSalomeResourcesManager -lSalomeNotification \
-lSalomeIDLKernel -lSALOMELocalTrace \ -lSalomeIDLKernel -lSALOMELocalTrace \
$(GEOM_LDFLAGS) -lNMTDS -lSalomeIDLGEOM \ $(GEOM_LDFLAGS) -lSalomeIDLGEOM \
$(CAS_KERNEL) $(CAS_KERNEL)