Added some TODOs and small fixing in cmake config file.
Authored by: droscy 2014-04-19
Parent: [r64]
Child: [r66]