From 6fb6abba22faf36bca31fcfdb05d84c08cfc9a58 Mon Sep 17 00:00:00 2001 From: alex85k Date: Tue, 17 Oct 2017 22:29:34 +0500 Subject: [PATCH] [lua] fix static build --- ports/lua/CMakeLists.txt | 2 +- ports/lua/CONTROL | 2 +- ports/lua/portfile.cmake | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/lua/CMakeLists.txt b/ports/lua/CMakeLists.txt index fc2e27e084..a967189532 100644 --- a/ports/lua/CMakeLists.txt +++ b/ports/lua/CMakeLists.txt @@ -59,7 +59,7 @@ IF (NOT DEFINED SKIP_INSTALL_TOOLS) 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 lua RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tools ) + INSTALL ( TARGETS luai luac RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tools ) ENDIF () IF (NOT DEFINED SKIP_INSTALL_HEADERS) diff --git a/ports/lua/CONTROL b/ports/lua/CONTROL index cf49dafe56..fa26bb00b9 100644 --- a/ports/lua/CONTROL +++ b/ports/lua/CONTROL @@ -1,3 +1,3 @@ Source: lua -Version: 5.3.4-2 +Version: 5.3.4-3 Description: a powerful, fast, lightweight, embeddable scripting language diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake index beda8362ee..3b7e8779c1 100644 --- a/ports/lua/portfile.cmake +++ b/ports/lua/portfile.cmake @@ -33,6 +33,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(READ ${CURRENT_PACKAGES_DIR}/include/luaconf.h LUA_CONF_H) string(REPLACE "defined(LUA_BUILD_AS_DLL)" "1" LUA_CONF_H "${LUA_CONF_H}") file(WRITE ${CURRENT_PACKAGES_DIR}/include/luaconf.h "${LUA_CONF_H}") + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools) endif() # Handle copyright