@cottsay Minor note. catkin_lint produces the following warning for endif arguments, since they aren't necessary.
```
CMakeLists.txt(17): error: extra arguments in endif()
```
Don't worry about modifying this PR though, I'm resolving other catkin_lint issues as well and will fix it.