Merge topic 'use-nonempty'

f37c14e930 Source: use cmNonempty()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5072