diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2022-06-23 15:17:49 +0300 |
|---|---|---|
| committer | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2022-06-23 15:17:49 +0300 |
| commit | 264ad0ce0cf1970b8faf07baca7a871aae9bd1d7 (patch) | |
| tree | dc460c4848dcf6be1deab935b7d98b97e8ab6435 | |
| parent | 662cc980fcd9a00b8566543f190c58590ccf706f (diff) | |
mac build fix
| -rw-r--r-- | indra/llwindow/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 2 deletions
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) |