From 43036db55408386a00d34cbc3d02ba43c75c3947 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Sun, 12 Oct 2014 00:57:23 -0700 Subject: [PATCH] cmake: Bring cocoadisplay back up to parity with ppremake. --- panda/src/cocoadisplay/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/panda/src/cocoadisplay/CMakeLists.txt b/panda/src/cocoadisplay/CMakeLists.txt index 82c5539d72..ce855a82c4 100644 --- a/panda/src/cocoadisplay/CMakeLists.txt +++ b/panda/src/cocoadisplay/CMakeLists.txt @@ -4,13 +4,14 @@ if(APPLE AND HAVE_GL AND HAVE_COCOA) cocoaGraphicsPipe.h cocoaGraphicsPipe.I cocoaGraphicsWindow.h cocoaGraphicsWindow.I cocoaGraphicsStateGuardian.h cocoaGraphicsStateGuardian.I - cocoaPandaView.h cocoaPandaWindowDelegate.h) + cocoaPandaApp.h cocoaPandaView.h cocoaPandaWindowDelegate.h) set(P3COCOADISPLAY_SOURCES config_cocoadisplay.mm cocoaGraphicsPipe.mm cocoaGraphicsStateGuardian.mm cocoaGraphicsWindow.mm + cocoaPandaApp.mm cocoaPandaView.mm cocoaPandaWindow.mm cocoaPandaWindowDelegate.mm) @@ -22,8 +23,9 @@ if(APPLE AND HAVE_GL AND HAVE_COCOA) # Frameworks: find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices) find_library(APPKIT_LIBRARY AppKit) + find_library(CARBON_LIBRARY Carbon) target_link_libraries(p3cocoadisplay - ${APPLICATIONSERVICES_LIBRARY} ${APPKIT_LIBRARY}) + ${APPLICATIONSERVICES_LIBRARY} ${APPKIT_LIBRARY} ${CARBON_LIBRARY}) install(TARGETS p3cocoadisplay DESTINATION lib) endif()