further cmakelists modifications