Merge branch 'V9_2_2_BR'

[tools/yacsgen.git] / module_generator / hxx_para_tmpl.py

diff --git a/module_generator/hxx_para_tmpl.py b/module_generator/hxx_para_tmpl.py
index c826faa6d53b737e002fa5f2ed954563c99d7066..98a7d3f5245bcd5d9926a2f60b8c41b266b94415 100644 (file)
--- a/module_generator/hxx_para_tmpl.py
+++ b/module_generator/hxx_para_tmpl.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2015  EDF R&D
+# Copyright (C) 2009-2019  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 try:
   from string import Template
 except:
-  from compat import Template,set
+  from module_generator.compat import Template,set
 
 cxxCompo="""
 // this cxx file was generated by yacsgen
@@ -131,7 +131,7 @@ class ${component};  // forward declaration
 
 class ${component}_i: ${inheritedclass}
   public POA_${module}_ORB::${component}_Gen,
-  public ParaMEDMEM::ParaMEDMEMComponent_i
+  public MEDCoupling::ParaMEDMEMComponent_i
 {
 
 public:
@@ -221,6 +221,7 @@ INCLUDE_DIRECTORIES(
   $${OMNIORB_INCLUDE_DIR}
   $${PROJECT_BINARY_DIR}
   $${PROJECT_BINARY_DIR}/idl
+  $${MEDCOUPLING_INCLUDE_DIRS}
   ${includes}
 )
 
@@ -238,13 +239,9 @@ SET(_link_LIBRARIES
   $${KERNEL_SalomeIDLKernel}
   $${KERNEL_OpUtil}
   $${KERNEL_SalomeContainer}
-  $${KERNEL_SalomeDSCContainer}
-  $${KERNEL_SalomeDSCSuperv}
-  $${KERNEL_SalomeDatastream}
-  $${KERNEL_SalomeDSCSupervBasic}
-  $${KERNEL_CalciumC}
   $${KERNEL_SalomeMPIContainer}
   $${MED_paramedmemcompo}
+  $${MED_paramedcouplingcorba}
   SalomeIDL${module}
   ${libs}
 )