Please remove commented out cmake calls (here and elsewhere)