Some cmake improvements.
Code reading improvements in Parser.cpp file.