Fixed Some Problems

Updated CMakelist and fixed some problems and warnings.

Merge request reports

Loading