Changed makefile
Added latest cmake from github