X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FCMakeLists.txt;h=f74124ea6effb801fcb7ea0e9ac2499ad026052d;hb=cdc2caa21375bc96aaad9bb7c3ee1140dac1d738;hp=9b834e9ad5e7c9d02f0c6e6344c90e2c5117db9a;hpb=a4702753c7da76a6434c9458f11ffce426be6e75;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index 9b834e9ad..f74124ea6 100644
--- 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,23 +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
@@ -71,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
@@ -83,11 +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
@@ -96,6 +90,7 @@ SET(PROJECT_LIBRARIES
 	ModelAPI
 	GeomAPI
 	GeomAlgoAPI
+	GeomValidators
 	${QT_LIBRARIES}
 	${CAS_VIEWER}
 	${CAS_KERNEL}
@@ -123,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}
 )