Refactor Packaging Cmake

[firthm01]

Packaging hasn't worked locally for a while - end up with targets missing in package. CI is currently working fine.

Clean up script to work locally as well as on CI