Salome HOME
#23999 EDF 22760 - integration of dev in SMESH (from branch 'gni/adaptation')
authoreap <eap@opencascade.com>
Sat, 20 Mar 2021 13:01:14 +0000 (16:01 +0300)
committereap <eap@opencascade.com>
Sat, 20 Mar 2021 13:01:14 +0000 (16:01 +0300)
1  2 
CMakeLists.txt
doc/salome/examples/tests.set
resources/CMakeLists.txt
src/SMESHGUI/CMakeLists.txt
src/SMESHGUI/SMESHGUI.cxx
src/SMESH_I/CMakeLists.txt
src/SMESH_I/SMESH_Gen_i.hxx

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge
@@@ -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 ---
Simple merge
@@@ -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 ---
Simple merge