diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-11-02 09:08:25 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-11-02 09:08:25 -0400 |
| commit | bb51ead8815d6f1843bed3f16dfae94aa0e85950 (patch) | |
| tree | 9b4f8911b15a36531a2d32e3550fe8744f805167 /indra/cmake | |
| parent | cf0838cd6917b7dd2c8f056d6cb3ef9f59d92fda (diff) | |
DRTVWR-589: Switch to the lua package built by new 3p-lua repo.
Also ditch crufty CMake logic related to lleventhost, which we haven't used
for years.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Lualibs.cmake | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/cmake/Lualibs.cmake b/indra/cmake/Lualibs.cmake index ec40d0f41c..e7d5875198 100644 --- a/indra/cmake/Lualibs.cmake +++ b/indra/cmake/Lualibs.cmake @@ -8,8 +8,15 @@ add_library( ll::lualibs INTERFACE IMPORTED ) use_system_binary( lualibs ) -use_prebuilt_binary(lualibs) +use_prebuilt_binary(lua) -target_link_libraries(ll::lualibs INTERFACE ${lualibs}) +target_include_directories( ll::lualibs SYSTEM INTERFACE + ${LIBS_PREBUILT_DIR}/include +) -target_include_directories( ll::lualibs SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/lualibs) +if (WINDOWS) + target_link_libraries(ll::lualibs INTERFACE lua54.dll) +elseif (DARWIN) + target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/liblua.a) +elseif (LINUX) +endif (WINDOWS) |