X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FCMakeLists.txt;h=48070d0ad2c2ea75c2af87d0cd1c717286d4bcca;hb=1e63ae393cf1ce1923329c90aa66fa33f957f268;hp=c54208e1205b88f74a51fcd0b62e9efc913eb41f;hpb=96392c3371f120ac065f9cc6eec4f92c615eddb3;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index c54208e12..48070d0ad 100644
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@ -1,115 +1,226 @@
-## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+## Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+## See http:##www.salome-platform.org/ or
+## email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+##
 
 INCLUDE(Common)
-SET(CMAKE_AUTOMOC ON)
+INCLUDE(UseQtExt)
+
+# --- options ---
+
+# additional include directories
+INCLUDE_DIRECTORIES(${QT_INCLUDES})
+
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(${QT_DEFINITIONS})
 
 SET(PROJECT_HEADERS
-	ModuleBase.h
-	ModuleBase_Filter.h
-	ModuleBase_FilterFactory.h
-	ModuleBase_FilterValidated.h
-	ModuleBase_Tools.h
-	ModuleBase_IModule.h
-	ModuleBase_Operation.h
-	ModuleBase_OperationDescription.h	
-	ModuleBase_ModelWidget.h
-	ModuleBase_WidgetBoolValue.h
-	ModuleBase_WidgetDoubleValue.h
-	ModuleBase_WidgetEditor.h
-	ModuleBase_WidgetFactory.h
-	ModuleBase_WidgetShapeSelector.h
-	ModuleBase_IWorkshop.h
-	ModuleBase_Definitions.h
-	ModuleBase_SelectionValidator.h
-	ModuleBase_ViewerPrs.h
-	ModuleBase_WidgetChoice.h
-	ModuleBase_WidgetFileSelector.h
-	ModuleBase_DoubleSpinBox.h
-	ModuleBase_IPropertyPanel.h
-	ModuleBase_ISelection.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
-	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
-	ModuleBase_WidgetIntValue.h
-    ModuleBase_IDocumentDataModel.h
+  ModuleBase.h
+  ModuleBase_ActionInfo.h
+  ModuleBase_Definitions.h
+  ModuleBase_DoubleSpinBox.h
+  ModuleBase_Events.h
+  ModuleBase_Filter.h
+  ModuleBase_FilterValidated.h
+  ModuleBase_IErrorMgr.h
+  ModuleBase_IModule.h
+  ModuleBase_IntSpinBox.h
+  ModuleBase_IPrefMgr.h
+  ModuleBase_IPropertyPanel.h
+  ModuleBase_ISelection.h
+  ModuleBase_IViewWindow.h
+  ModuleBase_IViewer.h
+  ModuleBase_IWidgetCreator.h
+  ModuleBase_IWorkshop.h
+  ModuleBase_LabelValue.h
+  ModuleBase_ModelWidget.h
+  ModuleBase_Operation.h
+  ModuleBase_OperationAction.h
+  ModuleBase_OperationDescription.h
+  ModuleBase_OperationFeature.h
+  ModuleBase_PageBase.h
+  ModuleBase_PageGroupBox.h
+  ModuleBase_PageWidget.h
+  ModuleBase_PagedContainer.h
+  ModuleBase_ParamIntSpinBox.h
+  ModuleBase_ParamSpinBox.h
+  ModuleBase_Preferences.h
+  ModuleBase_ResultPrs.h
+  ModuleBase_SelectionValidator.h
+  ModuleBase_ToolBox.h
+  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_WidgetLabelValue.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_Dialog.h
+  ModuleBase_ModelDialogWidget.h
+)
+
+SET(PROJECT_MOC_HEADERS
+  ModuleBase_Dialog.h
+  ModuleBase_DoubleSpinBox.h
+  ModuleBase_IErrorMgr.h
+  ModuleBase_IModule.h
+  ModuleBase_IntSpinBox.h
+  ModuleBase_IPropertyPanel.h
+  ModuleBase_IViewer.h
+  ModuleBase_IWorkshop.h
+  ModuleBase_LabelValue.h
+  ModuleBase_ModelDialogWidget.h
+  ModuleBase_ModelWidget.h
+  ModuleBase_Operation.h
+  ModuleBase_OperationAction.h
+  ModuleBase_OperationFeature.h
+  ModuleBase_PagedContainer.h
+  ModuleBase_PageGroupBox.h
+  ModuleBase_PageWidget.h
+  ModuleBase_ParamIntSpinBox.h
+  ModuleBase_ParamSpinBox.h
+  ModuleBase_Preferences.h
+  ModuleBase_ToolBox.h
+  ModuleBase_WidgetAction.h
+  ModuleBase_WidgetBoolValue.h
+  ModuleBase_WidgetChoice.h
+  ModuleBase_WidgetConcealedObjects.h
+  ModuleBase_WidgetDoubleValue.h
+  ModuleBase_WidgetEditor.h
+  ModuleBase_WidgetExprEditor.h
+  ModuleBase_WidgetFeatureSelector.h
+  ModuleBase_WidgetFileSelector.h
+  ModuleBase_WidgetIntValue.h
+  ModuleBase_WidgetLabel.h
+  ModuleBase_WidgetLabelValue.h
+  ModuleBase_WidgetLineEdit.h
+  ModuleBase_WidgetMultiSelector.h
+  ModuleBase_WidgetOptionalBox.h
+  ModuleBase_WidgetSelector.h
+  ModuleBase_WidgetShapeSelector.h
+  ModuleBase_WidgetSwitch.h
+  ModuleBase_WidgetToolbox.h
+  ModuleBase_WidgetValidated.h
 )
 
 SET(PROJECT_SOURCES
-	ModuleBase_Filter.cpp
-	ModuleBase_FilterFactory.cpp
-	ModuleBase_FilterValidated.cpp
-	ModuleBase_Tools.cpp
-	ModuleBase_IModule.cpp
-	ModuleBase_ISelection.cpp
-	ModuleBase_IWorkshop.cpp
-	ModuleBase_Operation.cpp
-	ModuleBase_OperationDescription.cpp
-	ModuleBase_ModelWidget.cpp
-	ModuleBase_WidgetBoolValue.cpp
-	ModuleBase_WidgetDoubleValue.cpp
-	ModuleBase_WidgetEditor.cpp
-	ModuleBase_WidgetFactory.cpp
-	ModuleBase_WidgetShapeSelector.cpp
-	ModuleBase_WidgetChoice.cpp
-	ModuleBase_WidgetFileSelector.cpp
-	ModuleBase_DoubleSpinBox.cpp
-	ModuleBase_WidgetLineEdit.cpp
-	ModuleBase_WidgetMultiSelector.cpp
-	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
-	ModuleBase_SelectionValidator.cpp
-	ModuleBase_WidgetIntValue.cpp
+  ModuleBase_ActionInfo.cpp
+  ModuleBase_DoubleSpinBox.cpp
+  ModuleBase_Filter.cpp
+  ModuleBase_FilterValidated.cpp
+  ModuleBase_IErrorMgr.cpp
+  ModuleBase_IModule.cpp
+  ModuleBase_IntSpinBox.cpp
+  ModuleBase_IPrefMgr.cpp
+  ModuleBase_IPropertyPanel.cpp
+  ModuleBase_ISelection.cpp
+  ModuleBase_IViewWindow.cpp
+  ModuleBase_IViewer.cpp
+  ModuleBase_IWidgetCreator.cpp
+  ModuleBase_IWorkshop.cpp
+  ModuleBase_LabelValue.cpp
+  ModuleBase_ModelWidget.cpp
+  ModuleBase_Operation.cpp
+  ModuleBase_OperationAction.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
+  ModuleBase_ToolBox.cpp
+  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_WidgetLabelValue.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_SelectionValidator.cpp
+  ModuleBase_Dialog.cpp
 )
 
 SET(PROJECT_LIBRARIES
 	Config
 	Events
 	ModelAPI
+	ModelGeomAlgo
 	GeomAPI
 	GeomDataAPI
 	GeomAlgoAPI
-	GeomValidators
 	${QT_LIBRARIES}
 	${CAS_VIEWER}
 	${CAS_KERNEL}
 	${CAS_SHAPE}
 	${suit}
 	${qtx}
+	${ViewerData}
 )
 
-SET(PROJECT_AUTOMOC 
-    ${CMAKE_CURRENT_BINARY_DIR}/ModuleBase_automoc.cpp
-)
+# sources / moc wrappings
+QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_MOC_HEADERS})
 
-#QT5_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES})
 #QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES})
 
 SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES})
@@ -117,19 +228,22 @@ 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/Model
-    ${CMAKE_SOURCE_DIR}/src/ModelAPI
-    ${CMAKE_SOURCE_DIR}/src/GeomDataAPI
-    ${CMAKE_SOURCE_DIR}/src/GeomAPI
-    ${CMAKE_SOURCE_DIR}/src/GeomAlgoAPI
-    ${CMAKE_SOURCE_DIR}/src/GeomValidators
+    ${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}
 )
 
+IF(${HAVE_SALOME})
+  INCLUDE_DIRECTORIES(${SALOME_KERNEL_INCLUDE})
+ENDIF(${HAVE_SALOME})
+
 ADD_DEFINITIONS(-DMODULEBASE_EXPORTS ${CAS_DEFINITIONS})
-ADD_LIBRARY(ModuleBase SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
+ADD_LIBRARY(ModuleBase SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${PROJECT_AUTOMOC})
 TARGET_LINK_LIBRARIES(ModuleBase GeomAPI ${PROJECT_LIBRARIES})
 
-INSTALL(TARGETS ModuleBase DESTINATION bin)
+INSTALL(TARGETS ModuleBase DESTINATION ${SHAPER_INSTALL_BIN})