Small CMake tweaks for catkin

This doesn't fix everything, I'm still having that "long unsigned int" error