Add cmake installed files and remove unused old build options

Signed-off-by: David Greaves <david@dgreaves.com>
Release mer-2.82-4