INTERFACE_INCLUDE_DIRECTORIES should also be populated for static libs.
Restore appending build interface includes at generate time.
Merge topic 'minor-fixes' into next

2614718 Restore appending build interface includes at generate time.
51bb509 INTERFACE_INCLUDE_DIRECTORIES should also be populated for static libs.