Cmake packaging fixes

Adds to dgeiger's PR by updating some more library version handling (both cmake and pkgconfig).