Added proper x11/xcb window close event handling.  Fixed cmake cleanup issue.