diff options
| author | jasjuang <jasjuang@gmail.com> | 2017-09-30 15:41:03 -0700 |
|---|---|---|
| committer | jasjuang <jasjuang@gmail.com> | 2017-09-30 15:41:03 -0700 |
| commit | 2b6144854e59e5049f3c2dfb1e1b36cee00b1a4e (patch) | |
| tree | 10bcfca354c45afc0e352fc352f1725a2c9e2dea /ports/lua | |
| parent | 7e6da0c9e7cd4cfea6c88ca661d509e6f15a1a8c (diff) | |
| parent | 9569e69b7cd1e2a1ba36edd0c8ca52544d470d17 (diff) | |
| download | vcpkg-2b6144854e59e5049f3c2dfb1e1b36cee00b1a4e.tar.gz vcpkg-2b6144854e59e5049f3c2dfb1e1b36cee00b1a4e.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'ports/lua')
| -rw-r--r-- | ports/lua/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | ports/lua/CONTROL | 2 |
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 |