more cleanup in cmakelists