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
complément
[modules/smesh.git]
/
src
/
SMESHGUI
/
CMakeLists.txt
diff --git
a/src/SMESHGUI/CMakeLists.txt
b/src/SMESHGUI/CMakeLists.txt
index 023ddaa9239bbca18f9b8f77adf0c8e81ee822df..c0252dca40f9d7d64415d54da8940ec6cefa2ad5 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
@@
-17,15
+17,14
@@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-INCLUDE(UseQt
4
Ext)
+INCLUDE(UseQtExt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
- ${VTK_INCLUDE_DIRS}
${OGL_INCLUDE_DIRS}
${OGL_INCLUDE_DIRS}
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${PYTHON_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
@@
-42,14
+41,15
@@
INCLUDE_DIRECTORIES(
${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/SMESHClient
${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/SMESHClient
- ${PROJECT_SOURCE_DIR}/src/MEDWrapper/Base
+ ${PROJECT_SOURCE_DIR}/src/MEDWrapper
+ ${PROJECT_SOURCE_DIR}/src/ADAPTGUI
${PROJECT_BINARY_DIR}
${PROJECT_BINARY_DIR}/idl
)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${PROJECT_BINARY_DIR}
${PROJECT_BINARY_DIR}/idl
)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS}
)
${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS}
)
@@
-61,7
+61,7
@@
ENDIF(WIN32)
# libraries to link to
SET(_link_LIBRARIES
# libraries to link to
SET(_link_LIBRARIES
- ${
CAS_TKV3d
}
+ ${
OpenCASCADE_Visualization_LIBRARIES
}
${GUI_SalomePrs}
${GUI_suit}
${GUI_SUITApp}
${GUI_SalomePrs}
${GUI_suit}
${GUI_SUITApp}
@@
-103,6
+103,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
@@
-111,6
+112,7
@@
SET(_moc_HEADERS
SMESHGUI_RotationDlg.h
SMESHGUI_TranslationDlg.h
SMESHGUI_ScaleDlg.h
SMESHGUI_RotationDlg.h
SMESHGUI_TranslationDlg.h
SMESHGUI_ScaleDlg.h
+ SMESHGUI_OffsetDlg.h
SMESHGUI_SymmetryDlg.h
SMESHGUI_SewingDlg.h
SMESHGUI_DuplicateNodesDlg.h
SMESHGUI_SymmetryDlg.h
SMESHGUI_SewingDlg.h
SMESHGUI_DuplicateNodesDlg.h
@@
-142,8
+144,8
@@
SET(_moc_HEADERS
SMESHGUI_FieldSelectorWdg.h
SMESHGUI_DisplayEntitiesDlg.h
SMESHGUI_SplitBiQuad.h
SMESHGUI_FieldSelectorWdg.h
SMESHGUI_DisplayEntitiesDlg.h
SMESHGUI_SplitBiQuad.h
- SMESHGUI_PreVisualObj.h
SMESHGUI_IdPreview.h
SMESHGUI_IdPreview.h
+ SMESHGUI_PreVisualObj.h
)
# header files / no moc processing
)
# header files / no moc processing
@@
-164,6
+166,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
)
@@
-173,7
+176,7
@@
SET(SMESH_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
# --- sources ---
# sources / moc wrappings
# --- sources ---
# sources / moc wrappings
-QT
4_WRAP_CPP
(_moc_SOURCES ${_moc_HEADERS})
+QT
_WRAP_MOC
(_moc_SOURCES ${_moc_HEADERS})
# sources / static
SET(_other_SOURCES
# sources / static
SET(_other_SOURCES
@@
-188,6
+191,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
+202,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
@@
-206,6
+211,7
@@
SET(_other_SOURCES
SMESHGUI_RotationDlg.cxx
SMESHGUI_TranslationDlg.cxx
SMESHGUI_ScaleDlg.cxx
SMESHGUI_RotationDlg.cxx
SMESHGUI_TranslationDlg.cxx
SMESHGUI_ScaleDlg.cxx
+ SMESHGUI_OffsetDlg.cxx
SMESHGUI_SymmetryDlg.cxx
SMESHGUI_SewingDlg.cxx
SMESHGUI_DuplicateNodesDlg.cxx
SMESHGUI_SymmetryDlg.cxx
SMESHGUI_SewingDlg.cxx
SMESHGUI_DuplicateNodesDlg.cxx
@@
-278,4
+284,4
@@
INSTALL(TARGETS SMESH EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INS
INSTALL(FILES ${SMESH_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
INSTALL(FILES ${SMESH_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT
4
_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SMESH_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SMESH_INSTALL_RES_DATA}")