X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FCMakeLists.txt;h=c4fe31943fd2fab04a5925cc7e793c10ce1f391d;hb=e815d16900c2971b585566f4e66d023e30d02817;hp=2467dcd9832b2d356ef682b0a1e3e395f6329f72;hpb=b00c51f919a1de6a50403a7824a9d71d26c69993;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index 2467dcd98..c4fe31943 100644
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@ -4,10 +4,11 @@ INCLUDE(Common)
 SET(CMAKE_AUTOMOC ON)
 
 SET(PROJECT_HEADERS
-	ModuleBase.h
+  ModuleBase.h
   ModuleBase_ActionInfo.h
   ModuleBase_Definitions.h
   ModuleBase_DoubleSpinBox.h
+  ModuleBase_Events.h
   ModuleBase_Filter.h
   ModuleBase_FilterFactory.h
   ModuleBase_FilterValidated.h
@@ -19,27 +20,31 @@ SET(PROJECT_HEADERS
   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_OperationDescription.h
   ModuleBase_OperationFeature.h
   ModuleBase_PageBase.h
   ModuleBase_PageGroupBox.h
-  ModuleBase_PageWidget.h	
+  ModuleBase_PageWidget.h
   ModuleBase_PagedContainer.h
+  ModuleBase_ParamIntSpinBox.h
   ModuleBase_ParamSpinBox.h
   ModuleBase_Preferences.h
   ModuleBase_ResultPrs.h
   ModuleBase_SelectionValidator.h
-  ModuleBase_TableModel.h
   ModuleBase_ToolBox.h
   ModuleBase_Tools.h
   ModuleBase_ViewerFilters.h
   ModuleBase_ViewerPrs.h
+  ModuleBase_WidgetAction.h
   ModuleBase_WidgetBoolValue.h
+  ModuleBase_WidgetCheckGroupBox.h
   ModuleBase_WidgetChoice.h
+  ModuleBase_WidgetCreatorFactory.h
   ModuleBase_WidgetDoubleValue.h
   ModuleBase_WidgetEditor.h
   ModuleBase_WidgetExprEditor.h
@@ -50,13 +55,15 @@ SET(PROJECT_HEADERS
   ModuleBase_WidgetLineEdit.h
   ModuleBase_WidgetMultiSelector.h
   ModuleBase_WidgetSelector.h
+  ModuleBase_WidgetSelectorStore.h
   ModuleBase_WidgetShapeSelector.h
   ModuleBase_WidgetSwitch.h
   ModuleBase_WidgetToolbox.h
-  ModuleBase_WidgetTable.h
   ModuleBase_WidgetValidated.h
+  ModuleBase_WidgetValidator.h
   ModuleBase_IconFactory.h
-  ModuleBase_WidgetErrorLabel.h
+  ModuleBase_Dialog.h
+  ModuleBase_ModelDialogWidget.h
 )
 
 SET(PROJECT_SOURCES
@@ -73,26 +80,30 @@ SET(PROJECT_SOURCES
   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_OperationDescription.cpp
   ModuleBase_OperationFeature.cpp
   ModuleBase_PageBase.cpp
   ModuleBase_PageGroupBox.cpp
   ModuleBase_PageWidget.cpp
   ModuleBase_PagedContainer.cpp
+  ModuleBase_ParamIntSpinBox.cpp
   ModuleBase_ParamSpinBox.cpp
   ModuleBase_Preferences.cpp
   ModuleBase_ResultPrs.cpp
-  ModuleBase_TableModel.cpp
   ModuleBase_ToolBox.cpp
   ModuleBase_Tools.cpp
   ModuleBase_ViewerFilters.cpp
   ModuleBase_ViewerPrs.cpp
+  ModuleBase_WidgetAction.cpp
   ModuleBase_WidgetBoolValue.cpp
+  ModuleBase_WidgetCheckGroupBox.cpp
   ModuleBase_WidgetChoice.cpp
+  ModuleBase_WidgetCreatorFactory.cpp
   ModuleBase_WidgetDoubleValue.cpp
   ModuleBase_WidgetEditor.cpp
   ModuleBase_WidgetExprEditor.cpp
@@ -103,13 +114,15 @@ SET(PROJECT_SOURCES
   ModuleBase_WidgetLineEdit.cpp
   ModuleBase_WidgetMultiSelector.cpp
   ModuleBase_WidgetSelector.cpp
+  ModuleBase_WidgetSelectorStore.cpp
   ModuleBase_WidgetShapeSelector.cpp
   ModuleBase_WidgetSwitch.cpp
   ModuleBase_WidgetToolbox.cpp
-  ModuleBase_WidgetTable.cpp
   ModuleBase_WidgetValidated.cpp
+  ModuleBase_WidgetValidator.cpp
   ModuleBase_IconFactory.cpp
-  ModuleBase_WidgetErrorLabel.cpp
+  ModuleBase_SelectionValidator.cpp
+  ModuleBase_Dialog.cpp
 )
 
 SET(PROJECT_LIBRARIES
@@ -128,7 +141,7 @@ SET(PROJECT_LIBRARIES
 	${ViewerData}
 )
 
-SET(PROJECT_AUTOMOC 
+SET(PROJECT_AUTOMOC
     ${CMAKE_CURRENT_BINARY_DIR}/ModuleBase_automoc.cpp
 )
 
@@ -140,12 +153,12 @@ SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESO
 
 INCLUDE_DIRECTORIES(
     ${CAS_INCLUDE_DIRS}
-    ${CMAKE_SOURCE_DIR}/src/Config
-    ${CMAKE_SOURCE_DIR}/src/Events
-    ${CMAKE_SOURCE_DIR}/src/ModelAPI
-    ${CMAKE_SOURCE_DIR}/src/GeomDataAPI
-    ${CMAKE_SOURCE_DIR}/src/GeomAPI
-    ${CMAKE_SOURCE_DIR}/src/GeomAlgoAPI
+    ${PROJECT_SOURCE_DIR}/src/Config
+    ${PROJECT_SOURCE_DIR}/src/Events
+    ${PROJECT_SOURCE_DIR}/src/ModelAPI
+    ${PROJECT_SOURCE_DIR}/src/GeomDataAPI
+    ${PROJECT_SOURCE_DIR}/src/GeomAPI
+    ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
     ${SUIT_INCLUDE}
 )
 
@@ -153,4 +166,4 @@ ADD_DEFINITIONS(-DMODULEBASE_EXPORTS ${CAS_DEFINITIONS})
 ADD_LIBRARY(ModuleBase SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
 TARGET_LINK_LIBRARIES(ModuleBase GeomAPI ${PROJECT_LIBRARIES})
 
-INSTALL(TARGETS ModuleBase DESTINATION bin)
+INSTALL(TARGETS ModuleBase DESTINATION ${SHAPER_INSTALL_BIN})