Testing CMAKE trouble ....
lot of changes