aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralex85k <alex85k@github.com>2017-10-17 22:29:34 +0500
committeralex85k <alex85k@github.com>2017-10-17 22:29:34 +0500
commit6fb6abba22faf36bca31fcfdb05d84c08cfc9a58 (patch)
tree3759acc5cbb6a0a4b2ba140d6e3349c8eb3a2af6
parenta536a4630261684370cd1b43b88e8121fe50f9ad (diff)
downloadvcpkg-6fb6abba22faf36bca31fcfdb05d84c08cfc9a58.tar.gz
vcpkg-6fb6abba22faf36bca31fcfdb05d84c08cfc9a58.zip
[lua] fix static build
-rw-r--r--ports/lua/CMakeLists.txt2
-rw-r--r--ports/lua/CONTROL2
-rw-r--r--ports/lua/portfile.cmake1
3 files changed, 3 insertions, 2 deletions
diff --git a/ports/lua/CMakeLists.txt b/ports/lua/CMakeLists.txt
index fc2e27e08..a96718953 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 cf49dafe5..fa26bb00b 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 beda8362e..3b7e8779c 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