diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2026-08-25 13:21:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-08-25 13:21:03 -0400 |
| commit | f6f5cd0f888dd8ec53821aa4f26e307b51465da0 (patch) | |
| tree | addb875c9bc2b217d39d7d6fd4e4e0a5ea333745 /indra/cmake | |
| parent | 82caf452cdaa59357a25d0844afe0012419beed2 (diff) | |
| parent | 2e9c387fee881022aec13d5c85f901539683c18f (diff) | |
Merge pull request #3537 from secondlife/project/lua_editor
Alpha Viewer: Lua editor
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | indra/cmake/LSLDefinitions.cmake | 9 | ||||
| -rw-r--r-- | indra/cmake/ViewerMiscLibs.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/websocketpp.cmake | 7 |
4 files changed, 19 insertions, 0 deletions
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 820006bb5a..ea55bffb35 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -70,6 +70,7 @@ set(cmake_SOURCE_FILES VisualLeakDetector.cmake LibVLCPlugin.cmake WebRTC.cmake + websocketpp.cmake xxHash.cmake ZLIBNG.cmake ) diff --git a/indra/cmake/LSLDefinitions.cmake b/indra/cmake/LSLDefinitions.cmake new file mode 100644 index 0000000000..1a9a477118 --- /dev/null +++ b/indra/cmake/LSLDefinitions.cmake @@ -0,0 +1,9 @@ +# -*- cmake -*- +include(Prebuilt) + +use_prebuilt_binary(lsl_definitions) + +configure_file("${AUTOBUILD_INSTALL_DIR}/lsl_definitions/lsl_keywords.xml" + "${CMAKE_SOURCE_DIR}/newview/app_settings/keywords_lsl_default.xml" COPYONLY) +configure_file("${AUTOBUILD_INSTALL_DIR}/lsl_definitions/lua_keywords.xml" + "${CMAKE_SOURCE_DIR}/newview/app_settings/keywords_lua_default.xml" COPYONLY) diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index b77993afb1..a786aceb14 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -17,3 +17,5 @@ use_prebuilt_binary(nanosvg) use_prebuilt_binary(viewer-fonts) use_prebuilt_binary(google-fonts) use_prebuilt_binary(emoji_shortcodes) + +include(LSLDefinitions) diff --git a/indra/cmake/websocketpp.cmake b/indra/cmake/websocketpp.cmake new file mode 100644 index 0000000000..726f0a5e0b --- /dev/null +++ b/indra/cmake/websocketpp.cmake @@ -0,0 +1,7 @@ +# -*- cmake -*- +include(Prebuilt) + +add_library( ll::websocketpp INTERFACE IMPORTED ) + +use_system_binary( websocketpp ) +use_prebuilt_binary(websocketpp) |