Merge remote-tracking branch 'upstream/pr/1244'

* upstream/pr/1244:
  cmake: make package config relocatable