maj du template

[tools/sat.git] / src / environment.py

diff --git a/src/environment.py b/src/environment.py
index 4adeb116b8b1741422990dcb3596d3a7428d8df8..e397b99b687fb33a7ea46029bb23984be7e8a0a8 100644 (file)
--- a/src/environment.py
+++ b/src/environment.py
@@ -393,16 +393,16 @@ class SalomeEnviron:
         l_binpath_libpath = []
 
         # create additional ROOT_DIR for CPP components
-        if src.product.product_is_cpp(pi):
-            assert 'component_name' in pi, 'Error : CPP component should have a component_name field'
+        if 'component_name' in pi:
             compo_name = pi.component_name
-            compo_root_dir = compo_name + "_ROOT_DIR"
-            envcompo_root_dir = os.path.join(
-                        self.cfg.TOOLS.common.install_root, compo_name )
-            self.set(compo_root_dir ,  envcompo_root_dir)
-            bin_path = os.path.join(envcompo_root_dir, 'bin', 'salome')
-            lib_path = os.path.join(envcompo_root_dir, 'lib', 'salome')
-            l_binpath_libpath.append( (bin_path, lib_path) )
+            if compo_name + "CPP" == pi.name:
+                compo_root_dir = compo_name + "_ROOT_DIR"
+                envcompo_root_dir = os.path.join(
+                            self.cfg.TOOLS.common.install_root, compo_name )
+                self.set(compo_root_dir ,  envcompo_root_dir)
+                bin_path = os.path.join(envcompo_root_dir, 'bin', 'salome')
+                lib_path = os.path.join(envcompo_root_dir, 'lib', 'salome')
+                l_binpath_libpath.append( (bin_path, lib_path) )
 
         bin_path = os.path.join(env_root_dir, 'bin', 'salome')
         if src.get_property_in_product_cfg(pi, "fhs"):