Some changes to the cmakelists