X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FCMakeLists.txt;h=e1696341bd0b7e75e7bdf31c9a3523837064c2a2;hb=HEAD;hp=c62f185e4593c49b09599e619c4fbcade64fefc7;hpb=02ac54c6f33c5437c1d2204d704cf3da6fd31a8e;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/CMakeLists.txt b/src/SMESHGUI/CMakeLists.txt index c62f185e4..a3cdc6197 100644 --- a/src/SMESHGUI/CMakeLists.txt +++ b/src/SMESHGUI/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2024 CEA, EDF, OPEN CASCADE # # 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 # -INCLUDE(UseQt4Ext) +INCLUDE(UseQtExt) # --- options --- # additional include directories INCLUDE_DIRECTORIES( ${QT_INCLUDES} - ${VTK_INCLUDE_DIRS} ${OGL_INCLUDE_DIRS} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} @@ -35,6 +34,7 @@ INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${HDF5_INCLUDE_DIRS} + ${MEDCOUPLING_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/OBJECT ${PROJECT_SOURCE_DIR}/src/SMESHFiltersSelection ${PROJECT_SOURCE_DIR}/src/SMDS @@ -42,14 +42,16 @@ INCLUDE_DIRECTORIES( ${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/SMESH_I + ${PROJECT_SOURCE_DIR}/src/SMESH ${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}/idl ) # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) @@ -61,7 +63,7 @@ ENDIF(WIN32) # libraries to link to SET(_link_LIBRARIES - ${CAS_TKV3d} + ${OpenCASCADE_Visualization_LIBRARIES} ${GUI_SalomePrs} ${GUI_suit} ${GUI_SUITApp} @@ -74,6 +76,7 @@ SET(_link_LIBRARIES SMDS SMESHControls SMESHObject + SMESHEngine ) # --- headers --- @@ -86,6 +89,7 @@ SET(_moc_HEADERS SMESHGUI_CreatePatternDlg.h SMESHGUI_NodesDlg.h SMESHGUI_SpinBox.h + SMESHGUI_SpinBoxForbiddendRange.h SMESHGUI_TransparencyDlg.h SMESHGUI_ClippingDlg.h SMESHGUI_GroupDlg.h @@ -103,6 +107,7 @@ SET(_moc_HEADERS SMESHGUI_MultiEditDlg.h SMESHGUI_DeleteGroupDlg.h SMESHGUI_GroupOpDlg.h + SMESHGUI_FaceGroupsSeparatedByEdgesDlg.h SMESHGUI_SmoothingDlg.h SMESHGUI_RenumberingDlg.h SMESHGUI_ExtrusionDlg.h @@ -111,6 +116,7 @@ SET(_moc_HEADERS SMESHGUI_RotationDlg.h SMESHGUI_TranslationDlg.h SMESHGUI_ScaleDlg.h + SMESHGUI_OffsetDlg.h SMESHGUI_SymmetryDlg.h SMESHGUI_SewingDlg.h SMESHGUI_DuplicateNodesDlg.h @@ -131,6 +137,7 @@ SET(_moc_HEADERS SMESHGUI_MakeNodeAtPointDlg.h SMESHGUI_MeshInfosBox.h SMESHGUI_Make2DFrom3DOp.h + SMESHGUI_MakeFull2DFrom3DOp.h SMESHGUI_FindElemByPointDlg.h SMESHGUI_MeshOrderDlg.h SMESHGUI_CopyMeshDlg.h @@ -142,8 +149,20 @@ SET(_moc_HEADERS SMESHGUI_FieldSelectorWdg.h SMESHGUI_DisplayEntitiesDlg.h SMESHGUI_SplitBiQuad.h - SMESHGUI_PreVisualObj.h SMESHGUI_IdPreview.h + SMESHGUI_PreVisualObj.h + SMESHGUI_MG_ADAPTDRIVER.h + SMESHGUI_MgAdaptDlg.h + SMESHGUI_HomardAdaptDlg.h + SMESHGUI_HomardBoundaryDlg.h + SMESHGUI_HomardListGroup.h + SMESHGUI_RemoveNodeReconnectionDlg.h + SMESHGUI_AddNodeOnSegmentDlg.h + SMESHGUI_AddNodeOnFaceDlg.h + SMESHGUI_InteractiveOp.h + SMESHGUI_CreateDualMeshDlg.h + SMESHGUI_CreateDualMeshOp.h + SMESHGUI_Meshio.h ) # header files / no moc processing @@ -164,7 +183,9 @@ SET(_other_HEADERS SMESHGUI_MeshEditPreview.h SMESHGUI_IdValidator.h SMESHGUI_FileValidator.h + SMESHGUI_SelectionProxy.h SMESH_SMESHGUI.hxx + SMESHGUI_HomardUtils.h ) # header files / to install @@ -173,7 +194,7 @@ SET(SMESH_HEADERS ${_moc_HEADERS} ${_other_HEADERS}) # --- sources --- # sources / moc wrappings -QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) +QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS}) # sources / static SET(_other_SOURCES @@ -183,11 +204,13 @@ SET(_other_SOURCES SMESHGUI_CreatePatternDlg.cxx SMESHGUI_NodesDlg.cxx SMESHGUI_SpinBox.cxx + SMESHGUI_SpinBoxForbiddendRange.cxx SMESHGUI_TransparencyDlg.cxx SMESHGUI_ClippingDlg.cxx SMESHGUI_GroupDlg.cxx SMESHGUI_RemoveNodesDlg.cxx SMESHGUI_RemoveElementsDlg.cxx + SMESHGUI_SelectionProxy.cxx SMESHGUI_MeshInfo.cxx SMESHGUI_Measurements.cxx SMESHGUI_Preferences_ScalarBarDlg.cxx @@ -198,6 +221,7 @@ SET(_other_SOURCES SMESHGUI_MultiEditDlg.cxx SMESHGUI_DeleteGroupDlg.cxx SMESHGUI_GroupOpDlg.cxx + SMESHGUI_FaceGroupsSeparatedByEdgesDlg.cxx SMESHGUI_SmoothingDlg.cxx SMESHGUI_RenumberingDlg.cxx SMESHGUI_ExtrusionDlg.cxx @@ -206,6 +230,7 @@ SET(_other_SOURCES SMESHGUI_RotationDlg.cxx SMESHGUI_TranslationDlg.cxx SMESHGUI_ScaleDlg.cxx + SMESHGUI_OffsetDlg.cxx SMESHGUI_SymmetryDlg.cxx SMESHGUI_SewingDlg.cxx SMESHGUI_DuplicateNodesDlg.cxx @@ -228,6 +253,7 @@ SET(_other_SOURCES SMESHGUI_FileInfoDlg.cxx SMESHGUI_MeshInfosBox.cxx SMESHGUI_Make2DFrom3DOp.cxx + SMESHGUI_MakeFull2DFrom3DOp.cxx SMESHGUI_FindElemByPointDlg.cxx SMESHGUI_MeshOrderDlg.cxx SMESHGUI_CopyMeshDlg.cxx @@ -255,6 +281,19 @@ SET(_other_SOURCES SMESHGUI_SplitBiQuad.cxx SMESHGUI_PreVisualObj.cxx SMESHGUI_IdPreview.cxx + SMESHGUI_MG_ADAPTDRIVER.cxx + SMESHGUI_MgAdaptDlg.cxx + SMESHGUI_HomardUtils.cxx + SMESHGUI_HomardAdaptDlg.cxx + SMESHGUI_HomardBoundaryDlg.cxx + SMESHGUI_HomardListGroup.cxx + SMESHGUI_RemoveNodeReconnectionDlg.cxx + SMESHGUI_AddNodeOnSegmentDlg.cxx + SMESHGUI_AddNodeOnFaceDlg.cxx + SMESHGUI_InteractiveOp.cxx + SMESHGUI_CreateDualMeshDlg.cxx + SMESHGUI_CreateDualMeshOp.cxx + SMESHGUI_Meshio.cxx ) # sources / to compile @@ -268,7 +307,10 @@ SET(_ts_RESOURCES SMESH_msg_en.ts SMESH_msg_fr.ts SMESH_msg_ja.ts -) + SMESHGUI_Homard_msg_en.ts + SMESHGUI_Homard_msg_fr.ts + SMESHGUI_Homard_msg_ja.ts +) # --- rules --- @@ -278,4 +320,4 @@ INSTALL(TARGETS SMESH EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INS INSTALL(FILES ${SMESH_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) -QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SMESH_INSTALL_RES_DATA}") +QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SMESH_INSTALL_RES_DATA}")