diff options
| author | Callum Linden <callum@lindenlab.com> | 2022-10-24 17:48:16 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2022-10-24 17:48:16 -0700 |
| commit | 80585d56fd6ccb0875c6353c7620a8ada749d66d (patch) | |
| tree | 139699b14e49609532ca717f9086f2039795801e /indra/llcommon/CMakeLists.txt | |
| parent | b0d69a20c262441125261c4949e59a8a1b9e9628 (diff) | |
| parent | e45b6159666b3aa271eaaa366fb4bcade2c2a28b (diff) | |
Merge master into DRTVWR-568 (and fix conflicts)
Diffstat (limited to 'indra/llcommon/CMakeLists.txt')
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 56939584bb..5770b319f7 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -253,6 +253,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) list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES}) @@ -270,8 +275,8 @@ target_link_libraries( ll::tracy ) -target_include_directories( llcommon INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) -target_include_directories( llcommon PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ) +target_include_directories(llcommon INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(llcommon PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) add_dependencies(llcommon stage_third_party_libs) |