Merge branch 'master' into omu/pleiade8084 (cmake support)

* master:
  Fix some documentation issues
  Version update: 7.4.1
  Replace "runSession" calls by "salome shell".
  Update documentation in "Examples"
  Add a test for most of the examples.
  Fixed regression when creating executable components.
  Fix localhost resource in an example schema.
  Build script added for every example.
  Examples updated for the new API which generates modules for cmake.
  Autotools replaced by cmake in generated modules.

Conflicts:
	module_generator/astcompo.py

diff --cc module_generator/astcompo.py
index 1b6e1c6d4f024e9ff3e14c790188c731c692a4c3,d5a001975bfabcfa24d0e98bfba0e1efca5885dc..a6dadbdab34520e5ce5ba70b88f50278ecfb1381
--- 1/module_generator/astcompo.py
--- 2/module_generator/astcompo.py
+++ b/module_generator/astcompo.py
@@@ -134,16 -140,17 +141,17 @@@ class ASTERComponent(Component)
      gen.aster = self.aster_dir
  
      #get ASTER version
 -    f = os.path.join(self.aster_dir, self.getAsterPythonPath(), 'Accas', 'properties.py')
 -    self.version=(0,0,0)
 -    if os.path.isfile(f):
 -      mydict = {}
 -      execfile(f, mydict)
 -      v,r,p = mydict['version'].split('.')
 -      self.version=(int(v),int(r),int(p))
 +#    f = os.path.join(self.aster_dir, self.getAsterPythonPath(), 'Accas', 'properties.py')
 +#    self.version=(0,0,0)
 +#    if os.path.isfile(f):
 +#      mydict = {}
 +#      execfile(f, mydict)
 +#      v,r,p = mydict['version'].split('.')
 +#      self.version=(int(v),int(r),int(p))
  
      if self.kind == "lib":
-       return {"Makefile.am":gen.makeMakefile(self.getMakefileItems(gen)),
+       f = self.name+".py"
+       return {"CMakeLists.txt":cmake_src_compo_aster_lib.substitute(sources=f),
                filename:self.makeaster(gen)}
      elif self.kind == "cexe":
        fdict=self.makecexepath(gen)