Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

[modules/shaper.git] / src / ModuleBase / CMakeLists.txt

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index c7a56cf5c4225c2a9fba53797aa340cdf703fd5c..f74124ea6effb801fcb7ea0e9ac2499ad026052d 100644 (file)
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@ -1,3 +1,5 @@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 INCLUDE(Common)
 SET(CMAKE_AUTOMOC ON)
 
@@ -5,7 +7,7 @@ SET(PROJECT_HEADERS
        ModuleBase.h
        ModuleBase_Filter.h
        ModuleBase_FilterFactory.h
-       ModuleBase_FilterLinearEdge.h
+       ModuleBase_FilterValidated.h
        ModuleBase_Tools.h
        ModuleBase_IModule.h
        ModuleBase_Operation.h
@@ -15,7 +17,6 @@ SET(PROJECT_HEADERS
        ModuleBase_WidgetDoubleValue.h
        ModuleBase_WidgetEditor.h
        ModuleBase_WidgetFactory.h
-       ModuleBase_WidgetSwitch.h
        ModuleBase_WidgetShapeSelector.h
        ModuleBase_IWorkshop.h
        ModuleBase_Definitions.h
@@ -33,12 +34,24 @@ SET(PROJECT_HEADERS
        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
 )
 
 SET(PROJECT_SOURCES
        ModuleBase_Filter.cpp
        ModuleBase_FilterFactory.cpp
-       ModuleBase_FilterLinearEdge.cpp
+       ModuleBase_FilterValidated.cpp
        ModuleBase_Tools.cpp
        ModuleBase_IModule.cpp
        ModuleBase_IWorkshop.cpp
@@ -49,7 +62,6 @@ SET(PROJECT_SOURCES
        ModuleBase_WidgetDoubleValue.cpp
        ModuleBase_WidgetEditor.cpp
        ModuleBase_WidgetFactory.cpp
-       ModuleBase_WidgetSwitch.cpp
        ModuleBase_WidgetShapeSelector.cpp
        ModuleBase_WidgetChoice.cpp
        ModuleBase_WidgetFileSelector.cpp
@@ -59,17 +71,32 @@ SET(PROJECT_SOURCES
        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
 )
 
 SET(PROJECT_LIBRARIES
-    Config
-    ModelAPI
+       Config
+       Events
+       ModelAPI
        GeomAPI
        GeomAlgoAPI
-    ${QT_LIBRARIES}
+       GeomValidators
+       ${QT_LIBRARIES}
        ${CAS_VIEWER}
        ${CAS_KERNEL}
        ${CAS_SHAPE}
+       ${suit}
+       ${qtx}
 )
 
 SET(PROJECT_AUTOMOC 
@@ -91,6 +118,8 @@ INCLUDE_DIRECTORIES(
     ${CMAKE_SOURCE_DIR}/src/GeomDataAPI
     ${CMAKE_SOURCE_DIR}/src/GeomAPI
     ${CMAKE_SOURCE_DIR}/src/GeomAlgoAPI
+    ${CMAKE_SOURCE_DIR}/src/GeomValidators
+    ${SUIT_INCLUDE}
 )
 
 ADD_DEFINITIONS(-DMODULEBASE_EXPORTS ${CAS_DEFINITIONS})