Merge branch 'Dev_2.1.0' of salome:modules/shaper into Dev_2.1.0

[modules/shaper.git] / src / PartSet / CMakeLists.txt

diff --git a/src/PartSet/CMakeLists.txt b/src/PartSet/CMakeLists.txt
index 39ff9186920ea91d0c50788169bd0f28dd1bf858..743e937fe279fd8ebcdabc81e52575e604c5abf2 100644 (file)
--- a/src/PartSet/CMakeLists.txt
+++ b/src/PartSet/CMakeLists.txt
@@ -15,7 +15,6 @@ SET(PROJECT_HEADERS
        PartSet_WidgetSketchLabel.h
        PartSet_Validators.h
        PartSet_WidgetPoint2d.h
-       PartSet_WidgetPoint2dAngle.h
        PartSet_WidgetEditor.h
        PartSet_WidgetMultiSelector.h
        PartSet_WidgetPoint2dDistance.h
@@ -25,9 +24,11 @@ SET(PROJECT_HEADERS
        PartSet_Filters.h
        PartSet_FilterInfinite.h
        PartSet_SketcherMgr.h
+       PartSet_SketcherReetntrantMgr.h
        PartSet_MenuMgr.h
        PartSet_WidgetSketchCreator.h
        PartSet_IconFactory.h
+       PartSet_WidgetChoice.h
 )
 
 SET(PROJECT_SOURCES
@@ -41,7 +42,6 @@ SET(PROJECT_SOURCES
        PartSet_WidgetEditor.cpp
        PartSet_WidgetMultiSelector.cpp
        PartSet_WidgetPoint2d.cpp
-       PartSet_WidgetPoint2dAngle.cpp
        PartSet_WidgetPoint2dDistance.cpp
        PartSet_WidgetPoint2DFlyout.cpp
        PartSet_WidgetShapeSelector.cpp
@@ -49,6 +49,7 @@ SET(PROJECT_SOURCES
        PartSet_Filters.cpp
        PartSet_FilterInfinite.cpp
        PartSet_SketcherMgr.cpp
+       PartSet_SketcherReetntrantMgr.cpp
        PartSet_MenuMgr.cpp
        PartSet_WidgetSketchCreator.cpp
        PartSet_IconFactory.cpp
@@ -66,7 +67,6 @@ SET(PROJECT_LIBRARIES
     ModuleBase
     Config
     GeomAPI
-    GeomValidators
     GeomDataAPI
        SketcherPrs
     ${QT_LIBRARIES}
@@ -104,7 +104,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/XGUI
                     ${CMAKE_SOURCE_DIR}/src/FeaturesPlugin
                     ${CMAKE_SOURCE_DIR}/src/PartSetPlugin
                     ${CMAKE_SOURCE_DIR}/src/GeomAPI
-                    ${CMAKE_SOURCE_DIR}/src/GeomValidators
                     ${CMAKE_SOURCE_DIR}/src/AppElements
                     ${CAS_INCLUDE_DIRS}
                     ${SUIT_INCLUDE}