X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FCMakeLists.txt;h=ea029d5bd10aca574a98ece6176dd9cd94d03773;hb=86c435d69e7b27d36c037ed028d79d8f32f021ac;hp=fd7878d103757eb542a6e5705a89b46c650ff25c;hpb=3400f9977cb5bbc2c00d5d797b572acd083d1675;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index fd7878d10..ea029d5bd 100644
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@ -5,97 +5,110 @@ 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
-	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_WidgetExprEditor.h
-	ModuleBase_ParamSpinBox.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_WidgetChoice.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_FilterValidated.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_WidgetExprEditor.cpp
-	ModuleBase_ParamSpinBox.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_WidgetChoice.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
@@ -103,14 +116,15 @@ SET(PROJECT_LIBRARIES
 	Events
 	ModelAPI
 	GeomAPI
+	GeomDataAPI
 	GeomAlgoAPI
-	GeomValidators
 	${QT_LIBRARIES}
 	${CAS_VIEWER}
 	${CAS_KERNEL}
 	${CAS_SHAPE}
 	${suit}
 	${qtx}
+	${ViewerData}
 )
 
 SET(PROJECT_AUTOMOC 
@@ -127,12 +141,10 @@ 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
     ${CMAKE_SOURCE_DIR}/src/GeomAlgoAPI
-    ${CMAKE_SOURCE_DIR}/src/GeomValidators
     ${SUIT_INCLUDE}
 )