diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-09-23 21:54:25 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-09-23 22:08:43 +0300 |
| commit | 46448f9547102cce3e23c522467ef800c8c266fc (patch) | |
| tree | 7e0d9f09e0a9049470523fa5b827804a140926f0 /indra/cmake/CMakeLists.txt | |
| parent | 4274eb591a1b0806f8c73ca16df65ade60db2200 (diff) | |
| parent | 3747dd9a085e4d75ec21c8048f1269bc3f29e582 (diff) | |
Merge branch 'develop' into marchcat/b-develop
# Conflicts:
# indra/newview/llfeaturemanager.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvoicewebrtc.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 10b17a6e26..b95c0d7ca8 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -25,6 +25,7 @@ set(cmake_SOURCE_FILES FreeType.cmake GLEXT.cmake GLH.cmake + GLM.cmake Havok.cmake Hunspell.cmake LLAddBuildTest.cmake |