diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-08-06 16:05:19 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-08-06 16:05:19 +0300 |
| commit | ce9d66cdd18c58c3b26fbebde633ae00732d7f9f (patch) | |
| tree | fdbc5a913c62265f95e610819637e096f0f85339 /indra/cmake/CMakeLists.txt | |
| parent | 514b658fde13bb0c0ec862b081eeebf47bace70d (diff) | |
| parent | 0f68bcd46ca3f2babf94303b80e2be006e4693ae (diff) | |
Merge branch develop into 2025.06
# Conflicts:
# indra/newview/llvoavatar.cpp
Diffstat (limited to 'indra/cmake/CMakeLists.txt')
| -rw-r--r-- | indra/cmake/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index cc217b0563..0a00ccbb5b 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -20,6 +20,7 @@ set(cmake_SOURCE_FILES Copy3rdPartyLibs.cmake DBusGlib.cmake DeploySharedLibs.cmake + Discord.cmake DragDrop.cmake EXPAT.cmake FindAutobuild.cmake |