X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModuleBase%2FCMakeLists.txt;h=7fa463bdc6b72aae0baa47c191d813209843259c;hb=c3d65a61b0e82724e3211ba475c124472c1de39d;hp=2e706ecb97b695885fb0c0062393195d865eb21c;hpb=5bc7e60d4b6c59c9e05f0aa6acfab22cced99e5e;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index 2e706ecb9..7fa463bdc 100644
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@ -2,33 +2,46 @@ INCLUDE(Common)
 SET(CMAKE_AUTOMOC ON)
 
 SET(PROJECT_HEADERS
-    ModuleBase.h
+	ModuleBase.h
 	ModuleBase_IOperation.h
 	ModuleBase_Operation.h
 	ModuleBase_OperationDescription.h	
-	ModuleBase_PropPanelOperation.h
 	ModuleBase_ModelWidget.h
+	ModuleBase_WidgetBoolValue.h
+	ModuleBase_WidgetDoubleValue.h
+	ModuleBase_WidgetEditor.h
 	ModuleBase_WidgetFactory.h
+	ModuleBase_WidgetFeature.h
 	ModuleBase_WidgetPoint2D.h
 	ModuleBase_WidgetSwitch.h
-	ModuleBase_MetaWidget.h
+	ModuleBase_WidgetSelector.h
+	ModuleBase_IWorkshop.h
+	ModuleBase_WidgetPoint2dDistance.h
 )
 
 SET(PROJECT_SOURCES
 	ModuleBase_IOperation.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_WidgetPoint2D.cpp
 	ModuleBase_WidgetSwitch.cpp
-	ModuleBase_MetaWidget.cpp
+	ModuleBase_WidgetSelector.cpp
+	ModuleBase_WidgetPoint2dDistance.cpp
 )
 
 SET(PROJECT_LIBRARIES
     Config
     ModelAPI
+	GeomAPI
     ${QT_LIBRARIES}
+	${CAS_VIEWER}
+	${CAS_KERNEL}
 )
 
 SET(PROJECT_AUTOMOC 
@@ -42,13 +55,17 @@ 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
 )
 
-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)