summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authornat-goodspeed <nat@lindenlab.com>2023-12-14 09:25:54 -0500
committerGitHub <noreply@github.com>2023-12-14 09:25:54 -0500
commit5a6174c0853f5a140343725312f2b63b42f2bbad (patch)
treebd45777f18dcfb6818318adf8d24bf1e8e6e0263 /indra/cmake
parent7e08b334fe418324ef13284b5d5b8310cf9a4de7 (diff)
parent0a731cd765cb05820e5e08956ba66cc85e987d3c (diff)
Merge pull request #11 from secondlife/DRTVWR-589-3p-lua
Merge 3p-lua use to trunk DRTVWR-589
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/Lualibs.cmake13
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/cmake/Lualibs.cmake b/indra/cmake/Lualibs.cmake
index ec40d0f41c..b6a7de41c6 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 ${ARCH_PREBUILT_DIRS_RELEASE}/lua54.lib)
+elseif (DARWIN)
+ target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/liblua.a)
+elseif (LINUX)
+endif (WINDOWS)