--- CMakeLists.txt.orig	2009-12-11 11:57:40.000000000 +0100
+++ CMakeLists.txt	2009-12-11 11:58:43.000000000 +0100
@@ -527,6 +527,44 @@
   ENDIF(VTK_USE_SYSTEM_GL2PS)
 ENDIF(VTK_USE_GL2PS)
 
+IF (VTK_USE_MANGLED_MESA)
+  IF (MANGLED_MESA_LIBRARY)
+    SET ( KitOpenGL_SRCS ${KitOpenGL_SRCS}
+                 vtkMesaActor.cxx
+                 vtkMesaCamera.cxx
+                 vtkMesaClipPlanesPainter.cxx
+                 vtkMesaCoincidentTopologyResolutionPainter.cxx
+                 vtkMesaDisplayListPainter.cxx
+                 vtkMesaImageActor.cxx
+                 vtkMesaImageMapper.cxx
+                 vtkMesaLight.cxx
+                 vtkMesaLightingPainter.cxx
+                 vtkMesaPainterDeviceAdapter.cxx
+                 vtkMesaPolyDataMapper.cxx
+                 vtkMesaPolyDataMapper2D.cxx
+                 vtkMesaProperty.cxx
+                 vtkMesaRenderWindow.cxx
+                 vtkMesaRenderer.cxx
+                 vtkMesaRepresentationPainter.cxx
+                 vtkMesaScalarsToColorsPainter.cxx
+                 vtkMesaTexture.cxx
+                 vtkXMesaRenderWindow.cxx
+                )
+    SET(KitOpenGL_SRCS ${KitOpenGL_SRCS}
+      vtkMesaFreeTypeTextMapper.cxx
+    )
+    SET_SOURCE_FILES_PROPERTIES(vtkMesaRenderWindow ABSTRACT)
+    SET (KIT_LIBS ${KIT_LIBS} ${MANGLED_MESA_LIBRARY})
+    IF(MANGLED_OSMESA_LIBRARY)
+      SET( KIT_LIBS ${KIT_LIBS} ${MANGLED_OSMESA_LIBRARY} )
+    ENDIF(MANGLED_OSMESA_LIBRARY)
+  ENDIF (MANGLED_MESA_LIBRARY)
+ELSE (VTK_USE_MANGLED_MESA)
+  IF(VTK_OPENGL_HAS_OSMESA  AND  OSMESA_LIBRARY)
+    SET(KIT_LIBS ${KIT_LIBS} ${OSMESA_LIBRARY})
+  ENDIF(VTK_OPENGL_HAS_OSMESA  AND  OSMESA_LIBRARY)
+ENDIF(VTK_USE_MANGLED_MESA)
+
 IF (WIN32)
   IF(VTK_USE_X)
     IF (OPENGL_gl_LIBRARY)
@@ -593,43 +631,6 @@
   SET(KIT_LIBS ${KIT_LIBS} ${OPENGL_glu_LIBRARY})
 ENDIF(VTK_USE_CG_SHADERS)
 
-IF (VTK_USE_MANGLED_MESA)
-  IF (MANGLED_MESA_LIBRARY)
-    SET ( KitOpenGL_SRCS ${KitOpenGL_SRCS}
-                 vtkMesaActor.cxx
-                 vtkMesaCamera.cxx
-                 vtkMesaClipPlanesPainter.cxx
-                 vtkMesaCoincidentTopologyResolutionPainter.cxx
-                 vtkMesaDisplayListPainter.cxx
-                 vtkMesaImageActor.cxx
-                 vtkMesaImageMapper.cxx
-                 vtkMesaLight.cxx
-                 vtkMesaLightingPainter.cxx
-                 vtkMesaPainterDeviceAdapter.cxx
-                 vtkMesaPolyDataMapper.cxx
-                 vtkMesaPolyDataMapper2D.cxx
-                 vtkMesaProperty.cxx
-                 vtkMesaRenderWindow.cxx
-                 vtkMesaRenderer.cxx
-                 vtkMesaRepresentationPainter.cxx
-                 vtkMesaScalarsToColorsPainter.cxx
-                 vtkMesaTexture.cxx
-                 vtkXMesaRenderWindow.cxx
-                )
-    SET(KitOpenGL_SRCS ${KitOpenGL_SRCS}
-      vtkMesaFreeTypeTextMapper.cxx
-    )
-    SET_SOURCE_FILES_PROPERTIES(vtkMesaRenderWindow ABSTRACT)
-    SET (KIT_LIBS ${KIT_LIBS} ${MANGLED_MESA_LIBRARY})
-    IF(MANGLED_OSMESA_LIBRARY)
-      SET( KIT_LIBS ${KIT_LIBS} ${MANGLED_OSMESA_LIBRARY} )
-    ENDIF(MANGLED_OSMESA_LIBRARY)
-  ENDIF (MANGLED_MESA_LIBRARY)
-ELSE (VTK_USE_MANGLED_MESA)
-  IF(VTK_OPENGL_HAS_OSMESA  AND  OSMESA_LIBRARY)
-    SET(KIT_LIBS ${KIT_LIBS} ${OSMESA_LIBRARY})
-  ENDIF(VTK_OPENGL_HAS_OSMESA  AND  OSMESA_LIBRARY)
-ENDIF(VTK_USE_MANGLED_MESA)
 SET(Kit_SRCS ${Kit_SRCS} ${KitOpenGL_SRCS})
 SET(Kit_EXTRA_SRCS ${Kit_EXTRA_SRCS} ${Kit_FT_SRCS})