Salome HOME
projects
/
plugins
/
hexoticplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix SIGSEGV in case MG-hexa is used on a mesh without a shape.
[plugins/hexoticplugin.git]
/
src
/
GUI
/
CMakeLists.txt
diff --git
a/src/GUI/CMakeLists.txt
b/src/GUI/CMakeLists.txt
index d1eb1036fccc4778b3b044f574d36cb33cc7d02f..6611e36aa9d59b5d005d26d30ac27cfd2d17baaa 100644
(file)
--- a/
src/GUI/CMakeLists.txt
+++ b/
src/GUI/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-20
16
CEA/DEN, EDF R&D
+# Copyright (C) 2012-20
20
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
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-25,25
+25,25
@@
INCLUDE(UseQtExt)
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${PYTHON_INCLUDES}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
${SMESH_INCLUDE_DIRS}
${PYTHON_INCLUDES}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
${SMESH_INCLUDE_DIRS}
- ${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${PROJECT_BINARY_DIR}/idl
${PROJECT_SOURCE_DIR}/src/HexoticPlugin
${Boost_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${PROJECT_BINARY_DIR}/idl
${PROJECT_SOURCE_DIR}/src/HexoticPlugin
+ ${PROJECT_SOURCE_DIR}/src/GUI
)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${QT_DEFINITIONS}
${OMNIORB_DEFINITIONS}
)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${QT_DEFINITIONS}
${OMNIORB_DEFINITIONS}
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
)
${BOOST_DEFINITIONS}
)
@@
-51,7
+51,8
@@
ADD_DEFINITIONS(
SET(_link_LIBRARIES
${SMESH_SMESH}
${SMESH_StdMeshersGUI}
SET(_link_LIBRARIES
${SMESH_SMESH}
${SMESH_StdMeshersGUI}
- ${CAS_KERNEL}
+ ${SMESH_PluginUtils}
+ ${OpenCASCADE_FoundationClasses_LIBRARIES}
${GUI_suit}
${GUI_qtx}
${GUI_SalomeApp}
${GUI_suit}
${GUI_qtx}
${GUI_SalomeApp}
@@
-66,6
+67,7
@@
SET(_link_LIBRARIES
SET(_moc_HEADERS
HexoticPluginGUI_HypothesisCreator.h
HexoticPluginGUI_Dlg.h
SET(_moc_HEADERS
HexoticPluginGUI_HypothesisCreator.h
HexoticPluginGUI_Dlg.h
+ HexoticPluginGUI_TreeWidget.h
)
# header files / no moc processed
)
# header files / no moc processed
@@
-84,9
+86,11
@@
QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
SET(_other_SOURCES
HexoticPluginGUI.cxx
HexoticPluginGUI_StdWidget.cxx
SET(_other_SOURCES
HexoticPluginGUI.cxx
HexoticPluginGUI_StdWidget.cxx
+ HexoticPluginGUI_AdvWidget.cxx
HexoticPluginGUI_SizeMapsWidget.cxx
HexoticPluginGUI_ViscousLayersWidget.cxx
HexoticPluginGUI_HypothesisCreator.cxx
HexoticPluginGUI_SizeMapsWidget.cxx
HexoticPluginGUI_ViscousLayersWidget.cxx
HexoticPluginGUI_HypothesisCreator.cxx
+ HexoticPluginGUI_TreeWidget.cxx
)
# --- resources ---
)
# --- resources ---
@@
-102,6
+106,7
@@
SET(_ts_RESOURCES
# resource files / to be processed by uic
SET(_uic_files
HexoticPluginGUI_StdWidget_QTD.ui
# resource files / to be processed by uic
SET(_uic_files
HexoticPluginGUI_StdWidget_QTD.ui
+ HexoticPluginGUI_AdvWidget_QTD.ui
HexoticPluginGUI_SizeMapsWidget_QTD.ui
HexoticPluginGUI_ViscousLayersWidget_QTD.ui
)
HexoticPluginGUI_SizeMapsWidget_QTD.ui
HexoticPluginGUI_ViscousLayersWidget_QTD.ui
)