[lua] Move tools to /tools/lua

This commit is contained in:
Robert Schumacher 2017-10-17 15:08:30 -07:00
parent 6fb6abba22
commit 1211c77766
3 changed files with 6 additions and 5 deletions

View File

@ -45,7 +45,7 @@ ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS )
ADD_LIBRARY ( lua ${SRC_LIBLUA} ) ADD_LIBRARY ( lua ${SRC_LIBLUA} )
IF (BUILD_SHARED_LIBS) IF (BUILD_SHARED_LIBS)
TARGET_COMPILE_DEFINITIONS (lua PRIVATE -DLUA_BUILD_AS_DLL ) TARGET_COMPILE_DEFINITIONS (lua PUBLIC -DLUA_BUILD_AS_DLL )
ENDIF () ENDIF ()
INSTALL ( TARGETS lua INSTALL ( TARGETS lua
@ -55,11 +55,11 @@ INSTALL ( TARGETS lua
) )
IF (NOT DEFINED SKIP_INSTALL_TOOLS) IF (NOT DEFINED SKIP_INSTALL_TOOLS)
ADD_EXECUTABLE ( luac src/luac.c ${SRC_LIBLUA} ) # compiler ADD_EXECUTABLE ( luac src/luac.c ${SRC_LIBLUA} ) # compiler uses non-exported APIs, so must include sources directly.
ADD_EXECUTABLE ( luai src/lua.c ) # interpreter ADD_EXECUTABLE ( luai src/lua.c ) # interpreter
TARGET_LINK_LIBRARIES ( luai lua ) TARGET_LINK_LIBRARIES ( luai lua )
SET_TARGET_PROPERTIES ( luai PROPERTIES OUTPUT_NAME lua PDB_NAME luai ) 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 RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tools/lua )
ENDIF () ENDIF ()
IF (NOT DEFINED SKIP_INSTALL_HEADERS) IF (NOT DEFINED SKIP_INSTALL_HEADERS)

View File

@ -1,3 +1,3 @@
Source: lua Source: lua
Version: 5.3.4-3 Version: 5.3.4-4
Description: a powerful, fast, lightweight, embeddable scripting language Description: a powerful, fast, lightweight, embeddable scripting language

View File

@ -33,9 +33,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
file(READ ${CURRENT_PACKAGES_DIR}/include/luaconf.h LUA_CONF_H) 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}") 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}") file(WRITE ${CURRENT_PACKAGES_DIR}/include/luaconf.h "${LUA_CONF_H}")
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools)
endif() endif()
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/lua)
# Handle copyright # Handle copyright
file(COPY ${CMAKE_CURRENT_LIST_DIR}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lua) file(COPY ${CMAKE_CURRENT_LIST_DIR}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lua)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()