Commit b2d6b57e authored by Ken Martin's avatar Ken Martin
Browse files

better apple support

parent 5a1b7cf7
......@@ -24,7 +24,7 @@ OPTION (VTK_DEBUG_LEAKS "Build leak checking support into vtk." OFF)
OPTION (VTK_USE_HYBRID "Build the hybrid directory classes")
OPTION (VTK_USE_PATENTED "Build the patented directory classes, these classes are patented and may require a license to use")
IF (APPLE)
OPTION (VTK_USE_QUARTZ "Build classes for the Quartz window manager" OFF)
OPTION (VTK_USE_QUARTZ "Build classes for the Quartz window manager" ON)
ENDIF(APPLE)
IF (CMAKE_HAS_X)
......
......@@ -46,7 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "stdlib.h"
#include "vtkDebugLeaks.h"
#ifdef VTK_USE_OGLR
// if using some sort of opengl, then include these files
#if defined(VTK_USE_OGLR) || defined(_WIN32) || defined(VTK_USE_QUARTZ)
#include "vtkOpenGLActor.h"
#include "vtkOpenGLCamera.h"
#include "vtkOpenGLImageActor.h"
......@@ -54,44 +55,30 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "vtkOpenGLProperty.h"
#include "vtkOpenGLPolyDataMapper.h"
#include "vtkOpenGLRenderer.h"
#include "vtkXOpenGLRenderWindow.h"
#include "vtkOpenGLTexture.h"
#include "vtkOpenGLVolumeTextureMapper2D.h"
#include "vtkOpenGLVolumeRayCastMapper.h"
#endif
// Win32 specific stuff
#ifdef _WIN32
#include "vtkOpenGLActor.h"
#include "vtkOpenGLCamera.h"
#include "vtkOpenGLImageActor.h"
#include "vtkOpenGLLight.h"
#include "vtkOpenGLProperty.h"
#include "vtkOpenGLPolyDataMapper.h"
#include "vtkOpenGLRenderer.h"
#include "vtkWin32OpenGLRenderWindow.h"
#include "vtkOpenGLTexture.h"
#include "vtkOpenGLVolumeTextureMapper2D.h"
#include "vtkOpenGLVolumeRayCastMapper.h"
#include "vtkWin32RenderWindowInteractor.h"
#else
#endif
// Apple OSX stuff
#ifdef VTK_USE_QUARTZ
#include "vtkOpenGLActor.h"
#include "vtkOpenGLCamera.h"
#include "vtkOpenGLImageActor.h"
#include "vtkOpenGLLight.h"
#include "vtkOpenGLProperty.h"
#include "vtkOpenGLPolyDataMapper.h"
#include "vtkOpenGLRenderer.h"
#include "vtkQuartzRenderWindow.h"
#include "vtkOpenGLTexture.h"
#include "vtkOpenGLVolumeTextureMapper2D.h"
#include "vtkOpenGLVolumeRayCastMapper.h"
#include "vtkQuartzRenderWindowInteractor.h"
#else
#include "vtkXRenderWindowInteractor.h"
#endif
// X OpenGL stuff
#ifdef VTK_USE_OGLR
#include "vtkXRenderWindowInteractor.h"
#include "vtkXOpenGLRenderWindow.h"
#endif
const char *vtkGraphicsFactory::GetRenderLibrary()
{
const char *temp;
......
......@@ -105,6 +105,10 @@ IF(NOT CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_ANSI_CFLAGS}")
ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
IF(APPLE)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-coalesce-templates -fno-coalesce-static-vtables")
ENDIF(APPLE)
IF(CMAKE_COMPILER_IS_GNUCXX)
IF(WIN32)
IF(UNIX)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment