Resolve merge conflict

Author: dgovil

pxr/imaging/glf/CMakeLists.txt

@@ -1,29 +1,17 @@
 set(PXR_PREFIX pxr/imaging)
 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_LIBRARY})
-    endif()
-else ()
-    list(APPEND optionalLibs ${Boost_PYTHON_LIBRARY})
-    list(APPEND optionalLibs ${X11_LIBRARIES})
-    if (TARGET OpenGL::GL)
-        list(APPEND optionalLibs OpenGL::GL)
-    endif()
+        "Skipping ${PXR_PACKAGE} because PXR_ENABLE_GL_SUPPORT is OFF")
+    return()
 endif()
 
 set(optionalPublicClasses "")
 if (X11_FOUND)
     list(APPEND optionalPublicClasses testGLContext)
 endif()
 
-set(optionalLibs "")
-set(optionalIncludeDirs "")
-
 pxr_library(glf
     LIBRARIES
         ar
@@ -36,11 +24,8 @@ pxr_library(glf
         tf
         trace
         sdf
-        ${optionalLibs}
-
-    INCLUDE_DIRS
-        ${Boost_INCLUDE_DIRS}
-        ${optionalIncludeDirs}
+        OpenGL::GL
+        ${X11_LIBRARIES}
 
     PUBLIC_CLASSES
         bindingMap
@@ -66,9 +51,6 @@ pxr_library(glf
     PUBLIC_HEADERS
         api.h
 
-    CPPFILES
-        ${optionalCppFiles}
-
     PYTHON_CPPFILES
         moduleDeps.cpp