Another attempt to fix linking
Merge branch 'cmake-improvements' into travis