Bladeren bron

cmake: Bring cocoadisplay back up to parity with ppremake.

Sam Edwards 11 jaren geleden
bovenliggende
commit
43036db554
1 gewijzigde bestanden met toevoegingen van 4 en 2 verwijderingen
  1. 4 2
      panda/src/cocoadisplay/CMakeLists.txt

+ 4 - 2
panda/src/cocoadisplay/CMakeLists.txt

@@ -4,13 +4,14 @@ if(APPLE AND HAVE_GL AND HAVE_COCOA)
       cocoaGraphicsPipe.h cocoaGraphicsPipe.I
       cocoaGraphicsPipe.h cocoaGraphicsPipe.I
       cocoaGraphicsWindow.h cocoaGraphicsWindow.I
       cocoaGraphicsWindow.h cocoaGraphicsWindow.I
       cocoaGraphicsStateGuardian.h cocoaGraphicsStateGuardian.I
       cocoaGraphicsStateGuardian.h cocoaGraphicsStateGuardian.I
-      cocoaPandaView.h cocoaPandaWindowDelegate.h)
+      cocoaPandaApp.h cocoaPandaView.h cocoaPandaWindowDelegate.h)
 
 
   set(P3COCOADISPLAY_SOURCES
   set(P3COCOADISPLAY_SOURCES
       config_cocoadisplay.mm
       config_cocoadisplay.mm
       cocoaGraphicsPipe.mm
       cocoaGraphicsPipe.mm
       cocoaGraphicsStateGuardian.mm
       cocoaGraphicsStateGuardian.mm
       cocoaGraphicsWindow.mm
       cocoaGraphicsWindow.mm
+      cocoaPandaApp.mm
       cocoaPandaView.mm
       cocoaPandaView.mm
       cocoaPandaWindow.mm
       cocoaPandaWindow.mm
       cocoaPandaWindowDelegate.mm)
       cocoaPandaWindowDelegate.mm)
@@ -22,8 +23,9 @@ if(APPLE AND HAVE_GL AND HAVE_COCOA)
   # Frameworks:
   # Frameworks:
   find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
   find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
   find_library(APPKIT_LIBRARY AppKit)
   find_library(APPKIT_LIBRARY AppKit)
+  find_library(CARBON_LIBRARY Carbon)
   target_link_libraries(p3cocoadisplay
   target_link_libraries(p3cocoadisplay
-    ${APPLICATIONSERVICES_LIBRARY} ${APPKIT_LIBRARY})
+    ${APPLICATIONSERVICES_LIBRARY} ${APPKIT_LIBRARY} ${CARBON_LIBRARY})
 
 
   install(TARGETS p3cocoadisplay DESTINATION lib)
   install(TARGETS p3cocoadisplay DESTINATION lib)
 endif()
 endif()