Further work on quotation issues in cmake

See #95 and comments to ab5a1981aa.