Improve generated Find<Module>.cmake

Change-Id: I9cd7564e2c8fedcbbcc71cb8c1f752962e26da2f