Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reanud's patch for modern Cpp11 compilers applied
[modules/shaper.git]
/
src
/
ModuleBase
/
CMakeLists.txt
diff --git
a/src/ModuleBase/CMakeLists.txt
b/src/ModuleBase/CMakeLists.txt
index 4a778cb41c93a7cd4a85b9c7cc9c29a6e8fac3d7..149ae47970144176f6e8d610b843808e4009e629 100644
(file)
--- a/
src/ModuleBase/CMakeLists.txt
+++ b/
src/ModuleBase/CMakeLists.txt
@@
-1,8
+1,16
@@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
INCLUDE(Common)
SET(CMAKE_AUTOMOC ON)
SET(PROJECT_HEADERS
ModuleBase.h
INCLUDE(Common)
SET(CMAKE_AUTOMOC ON)
SET(PROJECT_HEADERS
ModuleBase.h
+ ModuleBase_Filter.h
+ ModuleBase_FilterFace.h
+ ModuleBase_FilterFactory.h
+ ModuleBase_FilterLinearEdge.h
+ ModuleBase_FilterMulti.h
+ ModuleBase_FilterShapeType.h
ModuleBase_Tools.h
ModuleBase_IModule.h
ModuleBase_Operation.h
ModuleBase_Tools.h
ModuleBase_IModule.h
ModuleBase_Operation.h
@@
-12,15
+20,9
@@
SET(PROJECT_HEADERS
ModuleBase_WidgetDoubleValue.h
ModuleBase_WidgetEditor.h
ModuleBase_WidgetFactory.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_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_Definitions.h
ModuleBase_SelectionValidator.h
ModuleBase_ISelection.h
@@
-32,11
+34,24
@@
SET(PROJECT_HEADERS
ModuleBase_IViewer.h
ModuleBase_WidgetLineEdit.h
ModuleBase_WidgetMultiSelector.h
ModuleBase_IViewer.h
ModuleBase_WidgetLineEdit.h
ModuleBase_WidgetMultiSelector.h
+ ModuleBase_ViewerFilters.h
+ ModuleBase_ResultPrs.h
+ ModuleBase_IViewWindow.h
+ ModuleBase_WidgetLabel.h
+ ModuleBase_IPrefMgr.h
+ ModuleBase_Preferences.h
)
SET(PROJECT_SOURCES
)
SET(PROJECT_SOURCES
+ ModuleBase_Filter.cpp
+ ModuleBase_FilterFace.cpp
+ ModuleBase_FilterFactory.cpp
+ ModuleBase_FilterLinearEdge.cpp
+ ModuleBase_FilterMulti.cpp
+ ModuleBase_FilterShapeType.cpp
ModuleBase_Tools.cpp
ModuleBase_IModule.cpp
ModuleBase_Tools.cpp
ModuleBase_IModule.cpp
+ ModuleBase_IWorkshop.cpp
ModuleBase_Operation.cpp
ModuleBase_OperationDescription.cpp
ModuleBase_ModelWidget.cpp
ModuleBase_Operation.cpp
ModuleBase_OperationDescription.cpp
ModuleBase_ModelWidget.cpp
@@
-44,29
+59,30
@@
SET(PROJECT_SOURCES
ModuleBase_WidgetDoubleValue.cpp
ModuleBase_WidgetEditor.cpp
ModuleBase_WidgetFactory.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_WidgetSwitch.cpp
ModuleBase_WidgetShapeSelector.cpp
- ModuleBase_WidgetPoint2dDistance.cpp
- ModuleBase_WidgetValue.cpp
- ModuleBase_WidgetValueFeature.cpp
ModuleBase_WidgetChoice.cpp
ModuleBase_WidgetFileSelector.cpp
ModuleBase_DoubleSpinBox.cpp
ModuleBase_WidgetChoice.cpp
ModuleBase_WidgetFileSelector.cpp
ModuleBase_DoubleSpinBox.cpp
- ModuleBase_WidgetLineEdit.cpp
+
ModuleBase_WidgetLineEdit.cpp
ModuleBase_WidgetMultiSelector.cpp
ModuleBase_WidgetMultiSelector.cpp
+ ModuleBase_ViewerFilters.cpp
+ ModuleBase_ResultPrs.cpp
+ ModuleBase_WidgetLabel.cpp
+ ModuleBase_Preferences.cpp
)
SET(PROJECT_LIBRARIES
Config
ModelAPI
GeomAPI
)
SET(PROJECT_LIBRARIES
Config
ModelAPI
GeomAPI
+ GeomAlgoAPI
${QT_LIBRARIES}
${CAS_VIEWER}
${CAS_KERNEL}
${CAS_SHAPE}
${QT_LIBRARIES}
${CAS_VIEWER}
${CAS_KERNEL}
${CAS_SHAPE}
+ ${suit}
+ ${qtx}
)
SET(PROJECT_AUTOMOC
)
SET(PROJECT_AUTOMOC
@@
-87,6
+103,8
@@
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/ModelAPI
${CMAKE_SOURCE_DIR}/src/GeomDataAPI
${CMAKE_SOURCE_DIR}/src/GeomAPI
${CMAKE_SOURCE_DIR}/src/ModelAPI
${CMAKE_SOURCE_DIR}/src/GeomDataAPI
${CMAKE_SOURCE_DIR}/src/GeomAPI
+ ${CMAKE_SOURCE_DIR}/src/GeomAlgoAPI
+ ${SUIT_INCLUDE}
)
ADD_DEFINITIONS(-DMODULEBASE_EXPORTS ${CAS_DEFINITIONS})
)
ADD_DEFINITIONS(-DMODULEBASE_EXPORTS ${CAS_DEFINITIONS})