even more changes to cmakelists