Import 2017-06-07 23:51:09: master a4cebdcb

Diff Back to Repository
Author Committer Branch Timestamp Parent
jcfr jcfr master 2015-01-26 17:48:05 master 28236d35
Changeset

COMP: Update VTKv6/OpenGL2 to fix MacOSX build error

// ----------------
Author: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Mon Jan 26 17:10:01 2015 -0500

Fix MacOSX build error related to OpenGL2/vtkOpenGL.h. See #15285

This commit ensures the file defining VTK_USE_{CARBON|COCOA} is included
and fixes the following build error caught by Slicer dashboard:

// ---------
In file included from /Users/kitware/Dashboards/Experimental/Slicer-0/Modules/Loadable/VolumeRendering/VolumeRenderingReplacements/vtkSlicerOpenGLRayCastImageDisplayHelper.cxx:25:
/Users/kitware/Dashboards/Experimental/Slicer-0-build/VTKv6/Rendering/OpenGL2/vtkOpenGL.h:26:11: fatal error: 'GL/gl.h' file not found
# include  // Include OpenGL API.
          ^
1 error generated.
// ---------

// ----------------

git-svn-id: http://svn.slicer.org/Slicer4/trunk@23921 3bd1e089-480b-0410-8dfb-8563597acbee
mod - SuperBuild/External_VTKv6.cmake Diff File