#23999 EDF 22760 - integration of dev in SMESH (from branch 'gni/adaptation')

diff --cc CMakeLists.txt
Simple merge

diff --cc doc/salome/examples/tests.set
Simple merge

diff --cc resources/CMakeLists.txt
Simple merge

diff --cc src/SMESHGUI/CMakeLists.txt
index af116da9f4386db1b4596d9b83e3712cb74d2b57,237f63801af93a9f2685296bf3e33412b340e579..4f50dbc8e7d01bf44df59a10ee9cd9429e38e4e7
--- 1/src/SMESHGUI/CMakeLists.txt
--- 2/src/SMESHGUI/CMakeLists.txt
+++ b/src/SMESHGUI/CMakeLists.txt
@@@ -42,9 -42,9 +42,10 @@@ INCLUDE_DIRECTORIES
    ${PROJECT_SOURCE_DIR}/src/Controls
    ${PROJECT_SOURCE_DIR}/src/SMESHClient
    ${PROJECT_SOURCE_DIR}/src/MEDWrapper
 +  ${PROJECT_SOURCE_DIR}/src/SMESH_I
    ${PROJECT_BINARY_DIR}
    ${PROJECT_BINARY_DIR}/idl
+   ${MEDCOUPLING_INCLUDE_DIRS}
  )
  
  # additional preprocessor / compiler flags
@@@ -74,7 -74,7 +75,8 @@@ SET(_link_LIBRARIE
    SMDS
    SMESHControls
    SMESHObject
 +  SMESHEngine
+   ${MEDCoupling_medloader}
  )
  
  # --- headers ---

diff --cc src/SMESHGUI/SMESHGUI.cxx
Simple merge

diff --cc src/SMESH_I/CMakeLists.txt
index 9079fbf5a75fd310b1758e567296ee010b277ef7,9b2d937ffa304b216248e76c408e8238d0847abe..b9df761dd2f511c7492e19606d7c740c939a8b80
--- 1/src/SMESH_I/CMakeLists.txt
--- 2/src/SMESH_I/CMakeLists.txt
+++ b/src/SMESH_I/CMakeLists.txt
@@@ -38,8 -37,11 +38,9 @@@ INCLUDE_DIRECTORIES
    ${PROJECT_SOURCE_DIR}/src/DriverCGNS
    ${PROJECT_SOURCE_DIR}/src/SMESH
    ${PROJECT_SOURCE_DIR}/src/SMESHUtils
 -  #~${PROJECT_SOURCE_DIR}/src/ADAPT
    ${PROJECT_BINARY_DIR}
    ${PROJECT_BINARY_DIR}/idl
 -  #~${PROJECT_BINARY_DIR}/ADAPT
+   ${MEDCOUPLING_INCLUDE_DIRS}
  )
  
  # additional preprocessor / compiler flags
@@@ -112,7 -115,7 +114,8 @@@ SET(SMESHEngine_HEADER
    SMESH_PreMeshInfo.hxx
    SMESH_MeshPartDS.hxx
    SMESH.hxx
 +  SMESH_Component_Generator.hxx
+   MG_ADAPT_i.hxx
  )
  
  # --- sources ---
@@@ -140,7 -143,7 +143,8 @@@ SET(SMESHEngine_SOURCE
    SMESH_NoteBook.cxx
    SMESH_Measurements_i.cxx
    SMESH_PreMeshInfo.cxx
 +  SMESH_Component_Generator.cxx
+   MG_ADAPT_i.cxx
  )
  
  # --- rules ---

diff --cc src/SMESH_I/SMESH_Gen_i.hxx
Simple merge