Cmake improvements and Cylinder emitter

I have improved the CMake scripts a little and added a cylinder emitter.