diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 12:51:21 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 12:51:21 +0300 |
| commit | d9153532b8637cbfe992200effb1d24c597a732f (patch) | |
| tree | 123a168e400480ce9a8de780e068c232172c85cc /indra/newview/CMakeLists.txt | |
| parent | b06a99f7c76950484972e25d9dbbee8660a6a6c3 (diff) | |
| parent | bb3c36f5cbc0c3b542045fd27255eee24e03da22 (diff) | |
Merge branch 'main' into marchcat/x-mf-merge
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterimagepreview.cpp
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 738d8e540d..c2869eedfd 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -18,7 +18,6 @@ include(DragDrop) include(EXPAT) include(FMODSTUDIO) include(Hunspell) -include(ICU4C) include(JPEGEncoderBasic) include(JsonCpp) include(LLAppearance) @@ -1616,6 +1615,8 @@ set(viewer_APPSETTINGS_FILES app_settings/autoreplace.xml app_settings/cmd_line.xml app_settings/commands.xml + app_settings/emoji_groups.xml + app_settings/foldertypes.xml app_settings/grass.xml app_settings/ignorable_dialogs.xml app_settings/key_bindings.xml @@ -1931,7 +1932,6 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${LLPHYSICSEXTENSIONS_LIBRARIES} ll::bugsplat ll::tracy - ll::icu4c ) if( TARGET ll::intel_memops ) |