aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alex@karatarakis.com>2017-09-29 16:35:55 -0700
committerGitHub <noreply@github.com>2017-09-29 16:35:55 -0700
commit6c2297e03d2bcdc9de24749ad6dba2a5adc738fa (patch)
tree01eec1a5a0652f361993a3191a250865d97301c4
parent450cb8591a5023f762b4b928cb36ca632d0fe7b3 (diff)
parent493d94e2964b3c52d285d90c066d26157441b2dc (diff)
downloadvcpkg-6c2297e03d2bcdc9de24749ad6dba2a5adc738fa.tar.gz
vcpkg-6c2297e03d2bcdc9de24749ad6dba2a5adc738fa.zip
Merge pull request #1884 from TheCycoONE/lua_lib
Dynamically link lua.dll to lua.exe
-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