Although the books do not state where McGonagall's office is, it can be seen in the films.

Upon close inspection of the DADA classroom, one notices that the room curves very slightly along its longer side. It is unknown how this architecture can fit into the shape of the tower - one can only assume it is accomplished by magical means.