]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
Minor corrections to compile on Windows platform BR_WIN_compilation
authornds <nds@opencascade.com>
Mon, 27 Mar 2017 12:38:19 +0000 (15:38 +0300)
committernds <nds@opencascade.com>
Mon, 27 Mar 2017 12:38:19 +0000 (15:38 +0300)
src/GEOM/CMakeLists.txt
src/MeasureGUI/MeasureGUI_AnnotationInteractor.cxx
src/OBJECT/CMakeLists.txt

index 2c0c7605c012cc481f8bf35f98b5686250af88d2..4a73c259f361d7ab31744e1c4ab37615b589f0f8 100755 (executable)
@@ -39,6 +39,7 @@ SET(_link_LIBRARIES
   ${CAS_TKLCAF}
   ${CAS_TKCDF}
   ${CAS_TKG3d}
+  ${CAS_TKStdL}
   ${KERNEL_SALOMELocalTrace}
   ${KERNEL_OpUtil}
   GEOMSketcher
index 952c54bd20af633fe45a73b30de67fcff80f3bcd..7070c2259be8e8c1293bf9e75ddaaa9a9aa7b6a8 100755 (executable)
@@ -273,7 +273,7 @@ bool MeasureGUI_AnnotationInteractor::eventFilter( QObject* theObject, QEvent* t
       {
         const Handle(AIS_InteractiveContext) anAISContext = myViewer->getAISContext();
 
-        if ( anAISContext->IsHilighted( myActiveIO ) )
+        if ( anAISContext->IsHilighted( Handle(AIS_InteractiveObject)::DownCast( myActiveIO ) ) )
         {
           anAISContext->Unhilight( myActiveIO, Standard_False );
         }
index 2bc3e3f81f470302669221c71f480d4942b89078..4674ac750c62db0cae7ed8b549cd6a5e5b52f74e 100755 (executable)
@@ -48,6 +48,7 @@ SET(_link_LIBRARIES
   OCC2VTK
   SalomeIDLGEOM
   ${CAS_TKBRep}
+  ${CAS_TKOpenGl}
   ${KERNEL_SALOMELocalTrace}
   ${GUI_SalomeObject}
   ${GUI_SVTK}