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

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index cf2020c12..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
@@ -50,18 +44,14 @@ 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
 	ModuleBase_IWorkshop.cpp
@@ -90,6 +80,8 @@ SET(PROJECT_SOURCES
 	ModuleBase_WidgetSwitch.cpp
 	ModuleBase_WidgetToolbox.cpp
 	ModuleBase_WidgetValidated.cpp
+	ModuleBase_WidgetExprEditor.cpp
+	ModuleBase_ParamSpinBox.cpp
 )
 
 SET(PROJECT_LIBRARIES
@@ -98,6 +90,7 @@ SET(PROJECT_LIBRARIES
 	ModelAPI
 	GeomAPI
 	GeomAlgoAPI
+	GeomValidators
 	${QT_LIBRARIES}
 	${CAS_VIEWER}
 	${CAS_KERNEL}
@@ -125,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}
 )