this requires some modifications to the cmake deps and variants which
are being registered.

Signed-off-by: Rob Elliott <robert.elliott@arm.com>