cleaned up for cross-platform cmake builds and rolled back glm