Reintroduce dropped cmake options 2

Same as !64 (merged) During 1311e6d9 some important cmake options were dropped by mistake, causing additional dependencies to being pulled. Reintroduce the dropped options to fix the issue.

Signed-off-by: Walter Lozano walter.lozano@collabora.com