Updates to cmakeproject