X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FCMakeLists.txt;h=ddf454e2c6a816cf620a27716dd3c64492265ca2;hb=382d93420f7c2a22034b9d74a0d2dbc955e24acb;hp=2c4489db8ac4f5a568b615b04a306cf42d8a69ec;hpb=6df60c642d0427e2cb42bd29e2c64d4e5dbdaee4;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index 2c4489db8..ddf454e2c 100644
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@ -2,31 +2,76 @@ INCLUDE(Common)
 SET(CMAKE_AUTOMOC ON)
 
 SET(PROJECT_HEADERS
-    ModuleBase.h
-	ModuleBase_IOperation.h
+	ModuleBase.h
+	ModuleBase_Tools.h
+	ModuleBase_IModule.h
 	ModuleBase_Operation.h
 	ModuleBase_OperationDescription.h	
-	ModuleBase_PropPanelOperation.h
-	ModuleBase_WidgetCustom.h
+	ModuleBase_ModelWidget.h
+	ModuleBase_WidgetBoolValue.h
+	ModuleBase_WidgetDoubleValue.h
+	ModuleBase_WidgetEditor.h
 	ModuleBase_WidgetFactory.h
+	ModuleBase_WidgetFeature.h
+	ModuleBase_WidgetFeatureOrAttribute.h
 	ModuleBase_WidgetPoint2D.h
 	ModuleBase_WidgetSwitch.h
+	ModuleBase_WidgetShapeSelector.h
+	ModuleBase_IWorkshop.h
+	ModuleBase_WidgetPoint2dDistance.h
+	ModuleBase_WidgetValue.h
+	ModuleBase_WidgetValueFeature.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
 )
 
 SET(PROJECT_SOURCES
-	ModuleBase_IOperation.cpp
+	ModuleBase_Tools.cpp
+	ModuleBase_IModule.cpp
 	ModuleBase_Operation.cpp
 	ModuleBase_OperationDescription.cpp
-	ModuleBase_PropPanelOperation.cpp
+	ModuleBase_ModelWidget.cpp
+	ModuleBase_WidgetBoolValue.cpp
+	ModuleBase_WidgetDoubleValue.cpp
+	ModuleBase_WidgetEditor.cpp
 	ModuleBase_WidgetFactory.cpp
+	ModuleBase_WidgetFeature.cpp
+	ModuleBase_WidgetFeatureOrAttribute.cpp
 	ModuleBase_WidgetPoint2D.cpp
 	ModuleBase_WidgetSwitch.cpp
+	ModuleBase_WidgetShapeSelector.cpp
+	ModuleBase_WidgetPoint2dDistance.cpp
+	ModuleBase_WidgetValue.cpp
+	ModuleBase_WidgetValueFeature.cpp	
+	ModuleBase_WidgetChoice.cpp
+	ModuleBase_WidgetFileSelector.cpp
+	ModuleBase_DoubleSpinBox.cpp
+    ModuleBase_WidgetLineEdit.cpp
+	ModuleBase_WidgetMultiSelector.cpp
+	ModuleBase_ViewerFilters.cpp
+	ModuleBase_ResultPrs.cpp
 )
 
 SET(PROJECT_LIBRARIES
     Config
     ModelAPI
+	GeomAPI
+	GeomAlgoAPI
     ${QT_LIBRARIES}
+	${CAS_VIEWER}
+	${CAS_KERNEL}
+	${CAS_SHAPE}
 )
 
 SET(PROJECT_AUTOMOC 
@@ -40,13 +85,18 @@ SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESO
 #SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES})
 
 INCLUDE_DIRECTORIES(
-    ${PROJECT_SOURCE_DIR}/src/Config
+    ${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
 )
 
-ADD_DEFINITIONS(-DMODULEBASE_EXPORTS)
+ADD_DEFINITIONS(-DMODULEBASE_EXPORTS ${CAS_DEFINITIONS})
 ADD_LIBRARY(ModuleBase SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
-TARGET_LINK_LIBRARIES(ModuleBase ${PROJECT_LIBRARIES})
+TARGET_LINK_LIBRARIES(ModuleBase GeomAPI ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS ModuleBase DESTINATION bin)