Fix a compiler preprocessing issue in glPlatformContextDarwin.mm that…

… popped up after rebasing on latest dev
PixarAnimationStudios · Sep 11, 2024 · bb98ff8 · bb98ff8
1 parent 70e7008
commit bb98ff8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/cmake/defaults/Options.cmake b/cmake/defaults/Options.cmake
@@ -53,7 +53,6 @@ if(APPLE)
             MESSAGE(STATUS "Setting PXR_BUILD_USD_TOOLS=OFF because they are not supported on Apple embedded platforms")
             set(PXR_BUILD_USD_TOOLS OFF)
         endif()
-        set(PXR_ENABLE_GL_SUPPORT OFF)
     endif ()
 endif()
 
@@ -68,6 +67,10 @@ option(PXR_ENABLE_METAL_SUPPORT "Enable Metal based components" "${pxr_enable_me
 option(PXR_ENABLE_VULKAN_SUPPORT "Enable Vulkan based components" OFF)
 option(PXR_ENABLE_GL_SUPPORT "Enable OpenGL based components" ON)
 
+if (PXR_APPLE_EMBEDDED)
+    set(PXR_ENABLE_GL_SUPPORT OFF)
+endif ()
+
 # Precompiled headers are a win on Windows, not on gcc.
 set(pxr_enable_pch "OFF")
 if(MSVC)

diff --git a/pxr/imaging/garch/glPlatformContextDarwin.mm b/pxr/imaging/garch/glPlatformContextDarwin.mm
@@ -10,12 +10,12 @@
 #include "glPlatformContextDarwin.h"
 
 #if defined(PXR_GL_SUPPORT_ENABLED)
-#ifdef ARCH_OS_OSX
-#import <AppKit/NSOpenGL.h>
-typedef NSOpenGLContext NSGLContext;
-#elif defined ARCH_OS_IPHONE
+#ifdef ARCH_OS_IPHONE
 #import <UIKit/UIKit.h>
 typedef EAGLContext NSGLContext;
+#else
+#import <AppKit/NSOpenGL.h>
+typedef NSOpenGLContext NSGLContext;
 #endif
 #else
 typedef void* NSGLContext;

diff --git a/pxr/imaging/glf/CMakeLists.txt b/pxr/imaging/glf/CMakeLists.txt
@@ -5,18 +5,15 @@ set(PXR_PACKAGE glf)
 if (NOT ${PXR_ENABLE_GL_SUPPORT})
     message(STATUS
         "Building minimal ${PXR_PACKAGE} because PXR_ENABLE_GL_SUPPORT is OFF")
-    if (NOT PXR_APPLE_EMBEDDED)
-        list(APPEND optionalLibs OpenGL::GL)
-    endif()
-else ()
-    list(APPEND optionalLibs ${X11_LIBRARIES})
-    if (TARGET OpenGL::GL)
-        list(APPEND optionalLibs OpenGL::GL)
-    endif()
+endif ()
+
+if (TARGET OpenGL::GL)
+    list(APPEND optionalLibs OpenGL::GL)
 endif()
 
 set(optionalPublicClasses "")
 if (X11_FOUND)
+    list(APPEND optionalLibs ${X11_LIBRARIES})
     list(APPEND optionalPublicClasses testGLContext)
 endif()