From 9cf9db1a91e37949fdcb1110239affec3a1ed6ce Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Wed, 6 Apr 2016 14:07:37 -0400 Subject: [PATCH 1/2] Fixed mixup of deployment vs SDK check --- Rendering/OpenGL2/vtkCocoaRenderWindow.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Rendering/OpenGL2/vtkCocoaRenderWindow.mm b/Rendering/OpenGL2/vtkCocoaRenderWindow.mm index 6e35d196f67..0681c2633b0 100644 --- a/Rendering/OpenGL2/vtkCocoaRenderWindow.mm +++ b/Rendering/OpenGL2/vtkCocoaRenderWindow.mm @@ -871,7 +871,7 @@ void vtkCocoaRenderWindow::CreateGLContext() int i = 0; NSOpenGLPixelFormatAttribute attribs[20]; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 attribs[i++] = NSOpenGLPFAOpenGLProfile; attribs[i++] = NSOpenGLProfileVersion3_2Core; #endif @@ -926,7 +926,7 @@ void vtkCocoaRenderWindow::CreateGLContext() } else { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 this->SetContextSupportsOpenGL32(true); #else this->SetContextSupportsOpenGL32(false); -- GitLab From 9e612e6ddc4ad926dfed4140eebe37be4a6ce748 Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Wed, 6 Apr 2016 14:47:34 -0400 Subject: [PATCH 2/2] Increase VTK OS X minimum check from 10.6.0 to 10.6.8 This was already documented in README.md --- Rendering/OpenGL/vtkCocoaMacOSXSDKCompatibility.h | 4 ++-- Rendering/OpenGL2/vtkCocoaMacOSXSDKCompatibility.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Rendering/OpenGL/vtkCocoaMacOSXSDKCompatibility.h b/Rendering/OpenGL/vtkCocoaMacOSXSDKCompatibility.h index 864c5b4ac62..2e9bb9de8c5 100644 --- a/Rendering/OpenGL/vtkCocoaMacOSXSDKCompatibility.h +++ b/Rendering/OpenGL/vtkCocoaMacOSXSDKCompatibility.h @@ -25,8 +25,8 @@ PURPOSE. See the above copyright notice for more information. #error VTK requires the Mac OS X 10.6 SDK or later #endif -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 - #error VTK requires a deployment target of Mac OS X 10.6 or later +#if MAC_OS_X_VERSION_MIN_REQUIRED < 1068 + #error VTK requires a deployment target of Mac OS X 10.6.8 or later #endif // __has_feature is new in the 10.7 SDK, define it here if it's not yet defined. diff --git a/Rendering/OpenGL2/vtkCocoaMacOSXSDKCompatibility.h b/Rendering/OpenGL2/vtkCocoaMacOSXSDKCompatibility.h index 864c5b4ac62..2e9bb9de8c5 100644 --- a/Rendering/OpenGL2/vtkCocoaMacOSXSDKCompatibility.h +++ b/Rendering/OpenGL2/vtkCocoaMacOSXSDKCompatibility.h @@ -25,8 +25,8 @@ PURPOSE. See the above copyright notice for more information. #error VTK requires the Mac OS X 10.6 SDK or later #endif -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 - #error VTK requires a deployment target of Mac OS X 10.6 or later +#if MAC_OS_X_VERSION_MIN_REQUIRED < 1068 + #error VTK requires a deployment target of Mac OS X 10.6.8 or later #endif // __has_feature is new in the 10.7 SDK, define it here if it's not yet defined. -- GitLab