[master] CMakeLists.txt updated with bugfixes and improvements
3 files changed