Removed compilation errors and fine tuned CmakeLists.Txt file