Windows compatibility

diff --git a/src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx b/src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx
index c11065772b2d6a2a7d36f3581fa6d701614a40e6..4a2bf6e1a5949495b67864727e4000f82fa17643 100644 (file)
--- a/src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx
+++ b/src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx
@@ -141,7 +141,7 @@ bool OCCViewer_ClipPlaneInteractor::isClickable( const Handle(AIS_Plane)& thePla
 
   Handle(AIS_InteractiveContext) anAISContext = myViewer->getAISContext();
 
-  if ( anAISContext->IsSelected( thePlane ) )
+  if ( anAISContext->IsSelected( Handle(AIS_InteractiveObject)::DownCast(thePlane) ) )
   {
     return false;
   }
@@ -172,7 +172,7 @@ bool OCCViewer_ClipPlaneInteractor::isDraggable( const Handle(AIS_Plane)& thePla
 
   Handle(AIS_InteractiveContext) anAISContext = myViewer->getAISContext();
 
-  if ( !anAISContext->IsSelected( thePlane ) )
+  if ( !anAISContext->IsSelected( Handle(AIS_InteractiveObject)::DownCast(thePlane) ) ) 
   {
     return false;
   }
@@ -522,7 +522,7 @@ bool OCCViewer_ClipPlaneInteractor::mousePress( QMouseEvent* theEvent,
   // process mouse click on the object
   if ( myIsClickable )
   {
-    myViewer->getAISContext()->SetSelected( aPlane );
+    myViewer->getAISContext()->SetSelected( Handle(AIS_InteractiveObject)::DownCast(aPlane) );
     emit planeClicked( aPlane );
   }
 

diff --git a/src/Prs/CMakeLists.txt b/src/Prs/CMakeLists.txt
index 236e6f4ee4a72ceb5fab6a8cd212cf45e0906764..d0a219cd5fc5c89245ccf7973e9937a00d5695fc 100755 (executable)
--- a/src/Prs/CMakeLists.txt
+++ b/src/Prs/CMakeLists.txt
@@ -22,6 +22,11 @@ INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
 )
 
+# libraries to link to
+SET(_link_LIBRARIES ${CAS_KERNEL})
+
 ADD_LIBRARY(SalomePrs SALOME_Prs.cxx)
+TARGET_LINK_LIBRARIES(SalomePrs ${_link_LIBRARIES})
+
 INSTALL(TARGETS SalomePrs EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 INSTALL(FILES SALOME_Prs.h DESTINATION ${SALOME_INSTALL_HEADERS})

diff --git a/src/ViewerData/CMakeLists.txt b/src/ViewerData/CMakeLists.txt
index b85fd610d1b323875473fa8067836032bae2c149..a959fcdb16ce4c1c5631c97573316512d68a1ebc 100644 (file)
--- a/src/ViewerData/CMakeLists.txt
+++ b/src/ViewerData/CMakeLists.txt
@@ -28,7 +28,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(${CAS_DEFINITIONS})
 
 # libraries to link to
-SET(_link_LIBRARIES ${CAS_LDPATH} ${CAS_KERNEL} ${CAS_TKV3d})
+SET(_link_LIBRARIES ${CAS_LDPATH} ${CAS_KERNEL} ${CAS_VIEWER})
 
 # --- headers ---