X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FCMakeLists.txt;h=48c904e16dd9106faf7355a2f22b0c43c4f8db3f;hb=31c4ff77330b870d466fbd6b38e1fa566600f79a;hp=cf2020c1201b461db91435e0f5c99151e2bcb54b;hpb=ec6aaa4d8bd3609b04ea85683e1b1175b6632238;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index cf2020c12..48c904e16 100644
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@ -4,92 +4,115 @@ INCLUDE(Common)
 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_Tools.h
-	ModuleBase_IModule.h
-	ModuleBase_Operation.h
-	ModuleBase_OperationDescription.h	
-	ModuleBase_ModelWidget.h
-	ModuleBase_WidgetBoolValue.h
-	ModuleBase_WidgetDoubleValue.h
-	ModuleBase_WidgetEditor.h
-	ModuleBase_WidgetFactory.h
-	ModuleBase_WidgetShapeSelector.h
-	ModuleBase_IWorkshop.h
-	ModuleBase_Definitions.h
-	ModuleBase_SelectionValidator.h
-	ModuleBase_ISelection.h
-	ModuleBase_ViewerPrs.h
-	ModuleBase_WidgetChoice.h
-	ModuleBase_WidgetFileSelector.h
-	ModuleBase_DoubleSpinBox.h
-	ModuleBase_IPropertyPanel.h
-	ModuleBase_IViewer.h
-	ModuleBase_WidgetLineEdit.h
-	ModuleBase_WidgetMultiSelector.h
-	ModuleBase_ViewerFilters.h
-	ModuleBase_ResultPrs.h
-	ModuleBase_IViewWindow.h
-	ModuleBase_WidgetLabel.h
-	ModuleBase_IPrefMgr.h
-	ModuleBase_Preferences.h
-	ModuleBase_ActionInfo.h
-	ModuleBase_PageBase.h
-	ModuleBase_PageWidget.h	
-	ModuleBase_PageGroupBox.h
-	ModuleBase_PagedContainer.h
-	ModuleBase_WidgetSwitch.h
-	ModuleBase_WidgetToolbox.h
-	ModuleBase_WidgetValidated.h
+  ModuleBase.h
+  ModuleBase_ActionInfo.h
+  ModuleBase_Definitions.h
+  ModuleBase_DoubleSpinBox.h
+  ModuleBase_Filter.h
+  ModuleBase_FilterFactory.h
+  ModuleBase_FilterValidated.h
+  ModuleBase_IErrorMgr.h
+  ModuleBase_IModule.h
+  ModuleBase_IntSpinBox.h
+  ModuleBase_IPrefMgr.h
+  ModuleBase_IPropertyPanel.h
+  ModuleBase_ISelection.h
+  ModuleBase_IViewWindow.h
+  ModuleBase_IViewer.h
+  ModuleBase_IWidgetCreator.h
+  ModuleBase_IWorkshop.h
+  ModuleBase_ModelWidget.h
+  ModuleBase_Operation.h
+  ModuleBase_OperationAction.h
+  ModuleBase_OperationDescription.h	
+  ModuleBase_OperationFeature.h
+  ModuleBase_PageBase.h
+  ModuleBase_PageGroupBox.h
+  ModuleBase_PageWidget.h	
+  ModuleBase_PagedContainer.h
+  ModuleBase_ParamSpinBox.h
+  ModuleBase_Preferences.h
+  ModuleBase_ResultPrs.h
+  ModuleBase_SelectionValidator.h
+  ModuleBase_ToolBox.h
+  ModuleBase_Tools.h
+  ModuleBase_ViewerFilters.h
+  ModuleBase_ViewerPrs.h
+  ModuleBase_WidgetBoolValue.h
+  ModuleBase_WidgetCheckGroupBox.h
+  ModuleBase_WidgetChoice.h
+  ModuleBase_WidgetCreatorFactory.h
+  ModuleBase_WidgetDoubleValue.h
+  ModuleBase_WidgetEditor.h
+  ModuleBase_WidgetExprEditor.h
+  ModuleBase_WidgetFactory.h
+  ModuleBase_WidgetFileSelector.h
+  ModuleBase_WidgetIntValue.h
+  ModuleBase_WidgetLabel.h
+  ModuleBase_WidgetLineEdit.h
+  ModuleBase_WidgetMultiSelector.h
+  ModuleBase_WidgetSelector.h
+  ModuleBase_WidgetShapeSelector.h
+  ModuleBase_WidgetSwitch.h
+  ModuleBase_WidgetToolbox.h
+  ModuleBase_WidgetValidated.h
+  ModuleBase_IconFactory.h
+  ModuleBase_WidgetErrorLabel.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_Tools.cpp
-	ModuleBase_IModule.cpp
-	ModuleBase_IWorkshop.cpp
-	ModuleBase_Operation.cpp
-	ModuleBase_OperationDescription.cpp
-	ModuleBase_ModelWidget.cpp
-	ModuleBase_WidgetBoolValue.cpp
-	ModuleBase_WidgetDoubleValue.cpp
-	ModuleBase_WidgetEditor.cpp
-	ModuleBase_WidgetFactory.cpp
-	ModuleBase_WidgetShapeSelector.cpp
-	ModuleBase_WidgetChoice.cpp
-	ModuleBase_WidgetFileSelector.cpp
-	ModuleBase_DoubleSpinBox.cpp
-	ModuleBase_WidgetLineEdit.cpp
-	ModuleBase_WidgetMultiSelector.cpp
-	ModuleBase_ViewerFilters.cpp
-	ModuleBase_ResultPrs.cpp
-	ModuleBase_WidgetLabel.cpp
-	ModuleBase_Preferences.cpp
-	ModuleBase_ActionInfo.cpp
-	ModuleBase_PageBase.cpp
-	ModuleBase_PageWidget.cpp
-	ModuleBase_PageGroupBox.cpp
-	ModuleBase_PagedContainer.cpp
-	ModuleBase_WidgetSwitch.cpp
-	ModuleBase_WidgetToolbox.cpp
-	ModuleBase_WidgetValidated.cpp
+  ModuleBase_ActionInfo.cpp
+  ModuleBase_DoubleSpinBox.cpp
+  ModuleBase_Filter.cpp
+  ModuleBase_FilterFactory.cpp
+  ModuleBase_FilterValidated.cpp
+  ModuleBase_IErrorMgr.cpp
+  ModuleBase_IModule.cpp
+  ModuleBase_IntSpinBox.cpp
+  ModuleBase_IPrefMgr.cpp
+  ModuleBase_IPropertyPanel.cpp
+  ModuleBase_ISelection.cpp
+  ModuleBase_IViewWindow.cpp
+  ModuleBase_IViewer.cpp
+  ModuleBase_IWidgetCreator.cpp
+  ModuleBase_IWorkshop.cpp
+  ModuleBase_ModelWidget.cpp
+  ModuleBase_Operation.cpp
+  ModuleBase_OperationAction.cpp
+  ModuleBase_OperationDescription.cpp	
+  ModuleBase_OperationFeature.cpp
+  ModuleBase_PageBase.cpp
+  ModuleBase_PageGroupBox.cpp
+  ModuleBase_PageWidget.cpp
+  ModuleBase_PagedContainer.cpp
+  ModuleBase_ParamSpinBox.cpp
+  ModuleBase_Preferences.cpp
+  ModuleBase_ResultPrs.cpp
+  ModuleBase_ToolBox.cpp
+  ModuleBase_Tools.cpp
+  ModuleBase_ViewerFilters.cpp
+  ModuleBase_ViewerPrs.cpp
+  ModuleBase_WidgetBoolValue.cpp
+  ModuleBase_WidgetCheckGroupBox.cpp
+  ModuleBase_WidgetChoice.cpp
+  ModuleBase_WidgetCreatorFactory.cpp
+  ModuleBase_WidgetDoubleValue.cpp
+  ModuleBase_WidgetEditor.cpp
+  ModuleBase_WidgetExprEditor.cpp
+  ModuleBase_WidgetFactory.cpp
+  ModuleBase_WidgetFileSelector.cpp
+  ModuleBase_WidgetIntValue.cpp
+  ModuleBase_WidgetLabel.cpp
+  ModuleBase_WidgetLineEdit.cpp
+  ModuleBase_WidgetMultiSelector.cpp
+  ModuleBase_WidgetSelector.cpp
+  ModuleBase_WidgetShapeSelector.cpp
+  ModuleBase_WidgetSwitch.cpp
+  ModuleBase_WidgetToolbox.cpp
+  ModuleBase_WidgetValidated.cpp
+  ModuleBase_IconFactory.cpp
+  ModuleBase_WidgetErrorLabel.cpp
+  ModuleBase_SelectionValidator.cpp
 )
 
 SET(PROJECT_LIBRARIES
@@ -97,6 +120,7 @@ SET(PROJECT_LIBRARIES
 	Events
 	ModelAPI
 	GeomAPI
+	GeomDataAPI
 	GeomAlgoAPI
 	${QT_LIBRARIES}
 	${CAS_VIEWER}
@@ -104,6 +128,7 @@ SET(PROJECT_LIBRARIES
 	${CAS_SHAPE}
 	${suit}
 	${qtx}
+	${ViewerData}
 )
 
 SET(PROJECT_AUTOMOC 
@@ -120,7 +145,6 @@ INCLUDE_DIRECTORIES(
     ${CAS_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR}/src/Config
     ${CMAKE_SOURCE_DIR}/src/Events
-    ${CMAKE_SOURCE_DIR}/src/Model
     ${CMAKE_SOURCE_DIR}/src/ModelAPI
     ${CMAKE_SOURCE_DIR}/src/GeomDataAPI
     ${CMAKE_SOURCE_DIR}/src/GeomAPI