Linter fixes
Merge pull request #60 from smspillaz/cmake-unit.item_55

Linter fixes