X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModuleBase%2FCMakeLists.txt;h=7ff157483b100c09364b88cac572cd5837919885;hb=423f6b0a08a86d5e47115b87603cddeae4468b49;hp=ea029d5bd10aca574a98ece6176dd9cd94d03773;hpb=f7fec0e59ee28ac393cce1143c881b9995ae000f;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index ea029d5bd..7ff157483 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
@@ -24,12 +25,13 @@ SET(PROJECT_HEADERS
   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
@@ -38,24 +40,32 @@ SET(PROJECT_HEADERS
   ModuleBase_Tools.h
   ModuleBase_ViewerFilters.h
   ModuleBase_ViewerPrs.h
+  ModuleBase_WidgetAction.h
   ModuleBase_WidgetBoolValue.h
   ModuleBase_WidgetChoice.h
+  ModuleBase_WidgetConcealedObjects.h
+  ModuleBase_WidgetCreatorFactory.h
   ModuleBase_WidgetDoubleValue.h
   ModuleBase_WidgetEditor.h
   ModuleBase_WidgetExprEditor.h
   ModuleBase_WidgetFactory.h
+  ModuleBase_WidgetFeatureSelector.h
   ModuleBase_WidgetFileSelector.h
   ModuleBase_WidgetIntValue.h
   ModuleBase_WidgetLabel.h
   ModuleBase_WidgetLineEdit.h
   ModuleBase_WidgetMultiSelector.h
+  ModuleBase_WidgetOptionalBox.h
   ModuleBase_WidgetSelector.h
+  ModuleBase_WidgetSelectorStore.h
   ModuleBase_WidgetShapeSelector.h
   ModuleBase_WidgetSwitch.h
   ModuleBase_WidgetToolbox.h
   ModuleBase_WidgetValidated.h
+  ModuleBase_WidgetValidator.h
   ModuleBase_IconFactory.h
-  ModuleBase_WidgetErrorLabel.h
+  ModuleBase_Dialog.h
+  ModuleBase_ModelDialogWidget.h
 )
 
 SET(PROJECT_SOURCES
@@ -77,12 +87,13 @@ SET(PROJECT_SOURCES
   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
@@ -90,31 +101,39 @@ SET(PROJECT_SOURCES
   ModuleBase_Tools.cpp
   ModuleBase_ViewerFilters.cpp
   ModuleBase_ViewerPrs.cpp
+  ModuleBase_WidgetAction.cpp
   ModuleBase_WidgetBoolValue.cpp
   ModuleBase_WidgetChoice.cpp
+  ModuleBase_WidgetConcealedObjects.cpp
+  ModuleBase_WidgetCreatorFactory.cpp
   ModuleBase_WidgetDoubleValue.cpp
   ModuleBase_WidgetEditor.cpp
   ModuleBase_WidgetExprEditor.cpp
   ModuleBase_WidgetFactory.cpp
+  ModuleBase_WidgetFeatureSelector.cpp
   ModuleBase_WidgetFileSelector.cpp
   ModuleBase_WidgetIntValue.cpp
   ModuleBase_WidgetLabel.cpp
   ModuleBase_WidgetLineEdit.cpp
   ModuleBase_WidgetMultiSelector.cpp
+  ModuleBase_WidgetOptionalBox.cpp
   ModuleBase_WidgetSelector.cpp
+  ModuleBase_WidgetSelectorStore.cpp
   ModuleBase_WidgetShapeSelector.cpp
   ModuleBase_WidgetSwitch.cpp
   ModuleBase_WidgetToolbox.cpp
   ModuleBase_WidgetValidated.cpp
+  ModuleBase_WidgetValidator.cpp
   ModuleBase_IconFactory.cpp
-  ModuleBase_WidgetErrorLabel.cpp
   ModuleBase_SelectionValidator.cpp
+  ModuleBase_Dialog.cpp
 )
 
 SET(PROJECT_LIBRARIES
 	Config
 	Events
 	ModelAPI
+	ModelGeomAlgo
 	GeomAPI
 	GeomDataAPI
 	GeomAlgoAPI
@@ -127,7 +146,7 @@ SET(PROJECT_LIBRARIES
 	${ViewerData}
 )
 
-SET(PROJECT_AUTOMOC 
+SET(PROJECT_AUTOMOC
     ${CMAKE_CURRENT_BINARY_DIR}/ModuleBase_automoc.cpp
 )
 
@@ -139,12 +158,13 @@ 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/ModelGeomAlgo
+    ${PROJECT_SOURCE_DIR}/src/GeomDataAPI
+    ${PROJECT_SOURCE_DIR}/src/GeomAPI
+    ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
     ${SUIT_INCLUDE}
 )
 
@@ -152,4 +172,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})