aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen E. Baker <baker.stephen.e@gmail.com>2017-09-27 21:24:38 -0400
committerStephen E. Baker <baker.stephen.e@gmail.com>2017-09-27 21:24:38 -0400
commit493d94e2964b3c52d285d90c066d26157441b2dc (patch)
tree27e4494586b8f2b2ed36c6a2027ab3ae4b1c0442
parent548b7f69197fad294f44b6e3ae5f587116220fae (diff)
downloadvcpkg-493d94e2964b3c52d285d90c066d26157441b2dc.tar.gz
vcpkg-493d94e2964b3c52d285d90c066d26157441b2dc.zip
Dynamically link lua.dll to lua.exe
For lua.exe to load C modules which are linked against lua, it must itself be linked against lua, otherwise loading the module fails.
-rw-r--r--ports/lua/CMakeLists.txt5
-rw-r--r--ports/lua/CONTROL2
2 files changed, 4 insertions, 3 deletions
diff --git a/ports/lua/CMakeLists.txt b/ports/lua/CMakeLists.txt
index faef8018b..fc2e27e08 100644
--- a/ports/lua/CMakeLists.txt
+++ b/ports/lua/CMakeLists.txt
@@ -56,9 +56,10 @@ INSTALL ( TARGETS lua
IF (NOT DEFINED SKIP_INSTALL_TOOLS)
ADD_EXECUTABLE ( luac src/luac.c ${SRC_LIBLUA} ) # compiler
- ADD_EXECUTABLE ( luai src/lua.c ${SRC_LIBLUA} ) # interpreter
+ ADD_EXECUTABLE ( luai src/lua.c ) # interpreter
+ TARGET_LINK_LIBRARIES ( luai lua )
SET_TARGET_PROPERTIES ( luai PROPERTIES OUTPUT_NAME lua PDB_NAME luai )
- INSTALL ( TARGETS luai luac RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tools )
+ INSTALL ( TARGETS luai luac lua RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tools )
ENDIF ()
IF (NOT DEFINED SKIP_INSTALL_HEADERS)
diff --git a/ports/lua/CONTROL b/ports/lua/CONTROL
index e34436ad0..cf49dafe5 100644
--- a/ports/lua/CONTROL
+++ b/ports/lua/CONTROL
@@ -1,3 +1,3 @@
Source: lua
-Version: 5.3.4-1
+Version: 5.3.4-2
Description: a powerful, fast, lightweight, embeddable scripting language