Salome HOME
Merge from V7_2_BR 09/08/2013
authorvsr <vsr@opencascade.com>
Mon, 12 Aug 2013 10:50:36 +0000 (10:50 +0000)
committervsr <vsr@opencascade.com>
Mon, 12 Aug 2013 10:50:36 +0000 (10:50 +0000)
src/Controls/Makefile.am
src/SMDS/SMDS_MeshNode.cxx

index 24b28b1..59fcdd2 100644 (file)
@@ -54,7 +54,8 @@ libSMESHControls_la_LDFLAGS = \
        ../SMESHDS/libSMESHDS.la \
        ../SMESHUtils/libSMESHUtils.la \
        $(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo \
-       $(VTK_LIBS)
+       $(VTK_LIBS) \
+       $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics
 
 SMESHControls_CPPFLAGS = \
        $(libSMESHControls_la_CPPFLAGS)
index 80bbf81..01a1184 100644 (file)
@@ -165,7 +165,7 @@ public:
             cellList.push_back(vtkId);
           }
       }
-    myCells = &cellList[0];
+    myCells = cellList.empty() ? 0 : &cellList[0];
     myNcells = cellList.size();
     //MESSAGE("myNcells="<<myNcells);
   }