Merge branch 'master' into gni/adaptation

diff --cc src/CMakeLists.txt
Simple merge

diff --cc src/SMESH_I/CMakeLists.txt
Simple merge

diff --cc src/SMESH_I/SMESH_Gen_i.hxx
index 08cfb22f7e00a156411a74b1c4bf9b79a9dc1b2a,c78d57bfd9b8f99c9e9b05bfcf5a06851e78fc4e..fb16909b89743ceb7c0822599a0afd0ef66409a9
--- 1/src/SMESH_I/SMESH_Gen_i.hxx
--- 2/src/SMESH_I/SMESH_Gen_i.hxx
+++ b/src/SMESH_I/SMESH_Gen_i.hxx
@@@ -468,10 -475,7 +468,7 @@@ public
  
    void CleanPythonTrace();
  
 -  int CountInPyDump(const TCollection_AsciiString& text);
 +  static int CountInPyDump(const TCollection_AsciiString& text);
-   SMESH::MG_ADAPT_ptr CreateMG_ADAPT();
-   SMESH::MG_ADAPT_ptr CreateAdaptationHypothesis();
-   SMESH::MG_ADAPT_OBJECT_ptr Adaptation( const char* adaptationType);
  
    // *****************************************
    // Internal methods