Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

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

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index ea3235e1982f7c6642c5d1f815b5bcbda724631c..f74124ea6effb801fcb7ea0e9ac2499ad026052d 100644 (file)
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@ -6,14 +6,8 @@ SET(CMAKE_AUTOMOC ON)
 SET(PROJECT_HEADERS
        ModuleBase.h
        ModuleBase_Filter.h
-       ModuleBase_FilterCustom.h
-       ModuleBase_FilterFace.h
        ModuleBase_FilterFactory.h
-       ModuleBase_FilterLinearEdge.h
-       ModuleBase_FilterMulti.h
-       ModuleBase_FilterNoConsructionSubShapes.h
-       ModuleBase_FilterNoDegeneratedEdge.h
-       ModuleBase_FilterShapeType.h
+       ModuleBase_FilterValidated.h
        ModuleBase_Tools.h
        ModuleBase_IModule.h
        ModuleBase_Operation.h
@@ -23,7 +17,6 @@ SET(PROJECT_HEADERS
        ModuleBase_WidgetDoubleValue.h
        ModuleBase_WidgetEditor.h
        ModuleBase_WidgetFactory.h
-       ModuleBase_WidgetSwitch.h
        ModuleBase_WidgetShapeSelector.h
        ModuleBase_IWorkshop.h
        ModuleBase_Definitions.h
@@ -44,22 +37,21 @@ SET(PROJECT_HEADERS
        ModuleBase_IPrefMgr.h
        ModuleBase_Preferences.h
        ModuleBase_ActionInfo.h
-       ModuleBase_WidgetToolbox.h
        ModuleBase_PageBase.h
        ModuleBase_PageWidget.h 
        ModuleBase_PageGroupBox.h
+       ModuleBase_PagedContainer.h
+       ModuleBase_WidgetSwitch.h
+       ModuleBase_WidgetToolbox.h
+       ModuleBase_WidgetValidated.h
+       ModuleBase_WidgetExprEditor.h
+       ModuleBase_ParamSpinBox.h
 )
 
 SET(PROJECT_SOURCES
        ModuleBase_Filter.cpp
-       ModuleBase_FilterCustom.cpp
-       ModuleBase_FilterFace.cpp
        ModuleBase_FilterFactory.cpp
-       ModuleBase_FilterLinearEdge.cpp
-       ModuleBase_FilterMulti.cpp
-       ModuleBase_FilterNoConsructionSubShapes.cpp
-       ModuleBase_FilterNoDegeneratedEdge.cpp
-       ModuleBase_FilterShapeType.cpp
+       ModuleBase_FilterValidated.cpp
        ModuleBase_Tools.cpp
        ModuleBase_IModule.cpp
        ModuleBase_IWorkshop.cpp
@@ -70,7 +62,6 @@ SET(PROJECT_SOURCES
        ModuleBase_WidgetDoubleValue.cpp
        ModuleBase_WidgetEditor.cpp
        ModuleBase_WidgetFactory.cpp
-       ModuleBase_WidgetSwitch.cpp
        ModuleBase_WidgetShapeSelector.cpp
        ModuleBase_WidgetChoice.cpp
        ModuleBase_WidgetFileSelector.cpp
@@ -82,10 +73,15 @@ SET(PROJECT_SOURCES
        ModuleBase_WidgetLabel.cpp
        ModuleBase_Preferences.cpp
        ModuleBase_ActionInfo.cpp
-       ModuleBase_WidgetToolbox.cpp
        ModuleBase_PageBase.cpp
        ModuleBase_PageWidget.cpp
        ModuleBase_PageGroupBox.cpp
+       ModuleBase_PagedContainer.cpp
+       ModuleBase_WidgetSwitch.cpp
+       ModuleBase_WidgetToolbox.cpp
+       ModuleBase_WidgetValidated.cpp
+       ModuleBase_WidgetExprEditor.cpp
+       ModuleBase_ParamSpinBox.cpp
 )
 
 SET(PROJECT_LIBRARIES
@@ -94,6 +90,7 @@ SET(PROJECT_LIBRARIES
        ModelAPI
        GeomAPI
        GeomAlgoAPI
+       GeomValidators
        ${QT_LIBRARIES}
        ${CAS_VIEWER}
        ${CAS_KERNEL}
@@ -121,6 +118,7 @@ INCLUDE_DIRECTORIES(
     ${CMAKE_SOURCE_DIR}/src/GeomDataAPI
     ${CMAKE_SOURCE_DIR}/src/GeomAPI
     ${CMAKE_SOURCE_DIR}/src/GeomAlgoAPI
+    ${CMAKE_SOURCE_DIR}/src/GeomValidators
     ${SUIT_INCLUDE}
 )