Address Nick's notes (would be a great show name)

PixarAnimationStudios · Nov 1, 2023 · fc94305 · fc94305
1 parent 4e59d0f
commit fc94305
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
@@ -229,9 +229,10 @@ if (PXR_BUILD_IMAGING)
         if (POLICY CMP0072)
             cmake_policy(SET CMP0072 OLD)
         endif()
-        find_package(OpenGL REQUIRED)
         if (APPLE)
             set(OPENGL_gl_LIBRARY "-framework OpenGL")
+        else ()
+            find_package(OpenGL REQUIRED)
         endif()
     endif()
     # --Metal

diff --git a/pxr/imaging/garch/CMakeLists.txt b/pxr/imaging/garch/CMakeLists.txt
@@ -11,6 +11,7 @@ if(APPLE)
     set(GARCH_GLPLATFORMCONTEXT       glPlatformContextDarwin)
     set(GARCH_GLPLATFORMDEBUGWINDOW   glPlatformDebugWindowDarwin)
     set(GARCH_SOURCE_EXTENSION        mm)
+    set(GARCH_PLATFORM_LIBRARIES      "-framework AppKit")
 elseif(X11_FOUND)
     set(GARCH_GLPLATFORMCONTEXT       glPlatformContextGLX)
     set(GARCH_GLPLATFORMDEBUGWINDOW   glPlatformDebugWindowGLX)
@@ -21,14 +22,13 @@ elseif(WIN32)
     set(GARCH_SOURCE_EXTENSION        cpp)
 endif()
 
-
 pxr_library(garch
     LIBRARIES
         arch
         tf
         ${X11_LIBRARIES}
         ${OPENGL_gl_LIBRARY}
-        "-framework AppKit"
+        ${GARCH_PLATFORM_LIBRARIES}
 
     INCLUDE_DIRS
         ${Boost_INCLUDE_DIRS}