Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gni/adaptation
[modules/smesh.git]
/
src
/
SMESHGUI
/
CMakeLists.txt
diff --git
a/src/SMESHGUI/CMakeLists.txt
b/src/SMESHGUI/CMakeLists.txt
index 258033585a049cc6c69990c3755613dd0da04486..642d767df4947e23e7cdb42ae5bb6b00100e2ebd 100644
(file)
--- a/
src/SMESHGUI/CMakeLists.txt
+++ b/
src/SMESHGUI/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-20
20
CEA/DEN, EDF R&D, OPEN CASCADE
#
# 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
@@
-23,7
+23,6
@@
INCLUDE(UseQtExt)
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
- ${VTK_INCLUDE_DIRS}
${OGL_INCLUDE_DIRS}
${OpenCASCADE_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${OGL_INCLUDE_DIRS}
${OpenCASCADE_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
@@
-43,8
+42,10
@@
INCLUDE_DIRECTORIES(
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/SMESHClient
${PROJECT_SOURCE_DIR}/src/MEDWrapper
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/SMESHClient
${PROJECT_SOURCE_DIR}/src/MEDWrapper
+ ${PROJECT_SOURCE_DIR}/src/ADAPTGUI
${PROJECT_BINARY_DIR}
${PROJECT_BINARY_DIR}/idl
${PROJECT_BINARY_DIR}
${PROJECT_BINARY_DIR}/idl
+ ${PROJECT_BINARY_DIR}/src/ADAPTGUI
)
# additional preprocessor / compiler flags
)
# additional preprocessor / compiler flags
@@
-74,6
+75,9
@@
SET(_link_LIBRARIES
SMDS
SMESHControls
SMESHObject
SMDS
SMESHControls
SMESHObject
+ ADAPTGUI
+ ADAPTImpl
+ ADAPTEngine
)
# --- headers ---
)
# --- headers ---
@@
-103,6
+107,7
@@
SET(_moc_HEADERS
SMESHGUI_MultiEditDlg.h
SMESHGUI_DeleteGroupDlg.h
SMESHGUI_GroupOpDlg.h
SMESHGUI_MultiEditDlg.h
SMESHGUI_DeleteGroupDlg.h
SMESHGUI_GroupOpDlg.h
+ SMESHGUI_FaceGroupsSeparatedByEdgesDlg.h
SMESHGUI_SmoothingDlg.h
SMESHGUI_RenumberingDlg.h
SMESHGUI_ExtrusionDlg.h
SMESHGUI_SmoothingDlg.h
SMESHGUI_RenumberingDlg.h
SMESHGUI_ExtrusionDlg.h
@@
-144,6
+149,8
@@
SET(_moc_HEADERS
SMESHGUI_DisplayEntitiesDlg.h
SMESHGUI_SplitBiQuad.h
SMESHGUI_IdPreview.h
SMESHGUI_DisplayEntitiesDlg.h
SMESHGUI_SplitBiQuad.h
SMESHGUI_IdPreview.h
+ SMESHGUI_PreVisualObj.h
+ SMESHGUI_AdaptDlg.h
)
# header files / no moc processing
)
# header files / no moc processing
@@
-164,6
+171,7
@@
SET(_other_HEADERS
SMESHGUI_MeshEditPreview.h
SMESHGUI_IdValidator.h
SMESHGUI_FileValidator.h
SMESHGUI_MeshEditPreview.h
SMESHGUI_IdValidator.h
SMESHGUI_FileValidator.h
+ SMESHGUI_SelectionProxy.h
SMESH_SMESHGUI.hxx
)
SMESH_SMESHGUI.hxx
)
@@
-188,6
+196,7
@@
SET(_other_SOURCES
SMESHGUI_GroupDlg.cxx
SMESHGUI_RemoveNodesDlg.cxx
SMESHGUI_RemoveElementsDlg.cxx
SMESHGUI_GroupDlg.cxx
SMESHGUI_RemoveNodesDlg.cxx
SMESHGUI_RemoveElementsDlg.cxx
+ SMESHGUI_SelectionProxy.cxx
SMESHGUI_MeshInfo.cxx
SMESHGUI_Measurements.cxx
SMESHGUI_Preferences_ScalarBarDlg.cxx
SMESHGUI_MeshInfo.cxx
SMESHGUI_Measurements.cxx
SMESHGUI_Preferences_ScalarBarDlg.cxx
@@
-198,6
+207,7
@@
SET(_other_SOURCES
SMESHGUI_MultiEditDlg.cxx
SMESHGUI_DeleteGroupDlg.cxx
SMESHGUI_GroupOpDlg.cxx
SMESHGUI_MultiEditDlg.cxx
SMESHGUI_DeleteGroupDlg.cxx
SMESHGUI_GroupOpDlg.cxx
+ SMESHGUI_FaceGroupsSeparatedByEdgesDlg.cxx
SMESHGUI_SmoothingDlg.cxx
SMESHGUI_RenumberingDlg.cxx
SMESHGUI_ExtrusionDlg.cxx
SMESHGUI_SmoothingDlg.cxx
SMESHGUI_RenumberingDlg.cxx
SMESHGUI_ExtrusionDlg.cxx
@@
-256,6
+266,7
@@
SET(_other_SOURCES
SMESHGUI_SplitBiQuad.cxx
SMESHGUI_PreVisualObj.cxx
SMESHGUI_IdPreview.cxx
SMESHGUI_SplitBiQuad.cxx
SMESHGUI_PreVisualObj.cxx
SMESHGUI_IdPreview.cxx
+ SMESHGUI_AdaptDlg.cxx
)
# sources / to compile
)
# sources / to compile
@@
-269,7
+280,7
@@
SET(_ts_RESOURCES
SMESH_msg_en.ts
SMESH_msg_fr.ts
SMESH_msg_ja.ts
SMESH_msg_en.ts
SMESH_msg_fr.ts
SMESH_msg_ja.ts
-)
+)
# --- rules ---
# --- rules ---