Add cmake to depends
Fix lib/include variable names
Merge branch 'cmake-improvements' into travis