CMake linter cleanups
Merge pull request #66 from smspillaz/cmake-unit.item_60

CMake linter cleanups