diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-11-28 14:33:27 -0800 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-11-28 14:33:27 -0800 |
| commit | 0b188ac04ecdb1d620a427eacbf5fc089e0accc8 (patch) | |
| tree | 76f6afe9424d79bab8d30060d49aec3166d96ec8 /indra/llcommon/CMakeLists.txt | |
| parent | e9cd2b320ea2ecaab88e4904f7c81746ea617fea (diff) | |
| parent | c8f08f232a28f4e08b4acf525f0d316a101a0e27 (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-528
Diffstat (limited to 'indra/llcommon/CMakeLists.txt')
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 59aa731af2..df65828d02 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -266,6 +266,11 @@ set(llcommon_HEADER_FILES workqueue.h StackWalker.h ) + +if (DARWIN) + list(APPEND llcommon_HEADER_FILES llsys_objc.h) + list(APPEND llcommon_SOURCE_FILES llsys_objc.mm) +endif (DARWIN) set_source_files_properties(${llcommon_HEADER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) @@ -313,12 +318,6 @@ target_link_libraries( ${TRACY_LIBRARY} ) -if (DARWIN) - include(CMakeFindFrameworks) - find_library(CARBON_LIBRARY Carbon) - target_link_libraries(llcommon ${CARBON_LIBRARY}) -endif (DARWIN) - add_dependencies(llcommon stage_third_party_libs) if (LL_TESTS) |