From 264ad0ce0cf1970b8faf07baca7a871aae9bd1d7 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Thu, 23 Jun 2022 15:17:49 +0300 Subject: mac build fix --- indra/llwindow/CMakeLists.txt | 6 ++++++ indra/newview/CMakeLists.txt | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt index 70eb99c86c..55befaef51 100644 --- a/indra/llwindow/CMakeLists.txt +++ b/indra/llwindow/CMakeLists.txt @@ -197,4 +197,10 @@ if (SDL_FOUND) endif (SDL_FOUND) target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES}) + +if (DARWIN) + include(CMakeFindFrameworks) + find_library(CARBON_LIBRARY Carbon) + target_link_libraries(llwindow ${CARBON_LIBRARY}) +endif (DARWIN) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index ae8d8d51a4..964615320d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1413,14 +1413,12 @@ if (DARWIN) find_library(COCOA_LIBRARY Cocoa) find_library(IOKIT_LIBRARY IOKit) find_library(COREAUDIO_LIBRARY CoreAudio) - find_library(CARBON_LIBRARY Carbon) set(viewer_LIBRARIES ${COCOA_LIBRARY} ${AGL_LIBRARY} ${IOKIT_LIBRARY} ${COREAUDIO_LIBRARY} - ${CARBON_LIBRARY} ) if (USE_BUGSPLAT) -- cgit v1.2.3