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.

3 files changed, 12 insertions, 22 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)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 5dd4321330..ef4899978e 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -13,7 +13,6 @@ include(Copy3rdPartyLibs)
 include(ZLIBNG)
 include(URIPARSER)
 include(Tracy)
-include(lualibs)
 
 
 set(llcommon_SOURCE_FILES
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 6fc0f28a89..aa723c62cd 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1805,20 +1805,6 @@ if (WINDOWS)
 
     if (PACKAGE)
       add_custom_command(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2
-        COMMAND ${PYTHON_EXECUTABLE}
-        ARGS
-          ${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py
-          ${CMAKE_CURRENT_SOURCE_DIR}/..
-          ${CMAKE_CURRENT_BINARY_DIR}
-          ${CMAKE_CFG_INTDIR}
-        DEPENDS
-          lleventhost
-          ${EVENT_HOST_SCRIPTS}
-          ${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py
-        )
-
-      add_custom_command(
         OUTPUT ${CMAKE_CFG_INTDIR}/touched.bat
         COMMAND ${PYTHON_EXECUTABLE}
         ARGS
@@ -1847,9 +1833,6 @@ if (WINDOWS)
       add_custom_target(llpackage ALL DEPENDS
               ${CMAKE_CFG_INTDIR}/touched.bat
         )
-        # temporarily disable packaging of event_host until hg subrepos get
-        # sorted out on the parabuild cluster...
-        #${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2)
 
     endif (PACKAGE)
 elseif (DARWIN)
@@ -1917,6 +1900,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
         ${LLPHYSICSEXTENSIONS_LIBRARIES}
         ll::bugsplat
         ll::tracy
+        ll::lualibs
         )
 
 if( TARGET ll::intel_memops )
@@ -2287,7 +2271,7 @@ if (LL_TESTS)
 
   LL_ADD_INTEGRATION_TEST(llluamanager
     "llluamanager.cpp"
-    "${test_libs}"
+    "${test_libs};ll::lualibs"
     )
 
   LL_ADD_INTEGRATION_TEST(llsechandler_basic