resolves #22 and improves cmake argument handling