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

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index 4508cf3c4..f74124ea6 100644
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@ -6,14 +6,7 @@ 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
@@ -37,8 +30,6 @@ SET(PROJECT_HEADERS
 	ModuleBase_IViewer.h
 	ModuleBase_WidgetLineEdit.h
 	ModuleBase_WidgetMultiSelector.h
-	ModuleBase_ValidatorLinearEdge.h
-	ModuleBase_ValidatorLinearEdgeOrVertex.h
 	ModuleBase_ViewerFilters.h
 	ModuleBase_ResultPrs.h
 	ModuleBase_IViewWindow.h
@@ -53,18 +44,13 @@ SET(PROJECT_HEADERS
 	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
@@ -82,8 +68,6 @@ SET(PROJECT_SOURCES
 	ModuleBase_DoubleSpinBox.cpp
 	ModuleBase_WidgetLineEdit.cpp
 	ModuleBase_WidgetMultiSelector.cpp
-	ModuleBase_ValidatorLinearEdge.cpp
-	ModuleBase_ValidatorLinearEdgeOrVertex.cpp
 	ModuleBase_ViewerFilters.cpp
 	ModuleBase_ResultPrs.cpp
 	ModuleBase_WidgetLabel.cpp
@@ -96,6 +80,8 @@ SET(PROJECT_SOURCES
 	ModuleBase_WidgetSwitch.cpp
 	ModuleBase_WidgetToolbox.cpp
 	ModuleBase_WidgetValidated.cpp
+	ModuleBase_WidgetExprEditor.cpp
+	ModuleBase_ParamSpinBox.cpp
 )
 
 SET(PROJECT_LIBRARIES
@@ -104,6 +90,7 @@ SET(PROJECT_LIBRARIES
 	ModelAPI
 	GeomAPI
 	GeomAlgoAPI
+	GeomValidators
 	${QT_LIBRARIES}
 	${CAS_VIEWER}
 	${CAS_KERNEL}
@@ -131,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}
 )