Fix wrong boost include path
Merge branch 'cmake' into lb-refactor