diff options
Diffstat (limited to 'ports/lua')
| -rw-r--r-- | ports/lua/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | ports/lua/CONTROL | 2 | ||||
| -rw-r--r-- | ports/lua/portfile.cmake | 1 |
3 files changed, 14 insertions, 6 deletions
diff --git a/ports/lua/CMakeLists.txt b/ports/lua/CMakeLists.txt index 76ee6e15c..68de76788 100644 --- a/ports/lua/CMakeLists.txt +++ b/ports/lua/CMakeLists.txt @@ -25,22 +25,29 @@ src/ltable.c src/ltablib.c src/ltm.c src/lundump.c src/lutf8lib.c src/lvm.c src/ # append headers to sources to make them show up in MSVC GUI LIST(APPEND SRC_LIBLUA ${HDR_LIBLUA}) -IF (BUILD_SHARED_LIBS) - ADD_DEFINITIONS ( -DLUA_BUILD_AS_DLL ) -ENDIF () - # remove warnings ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS ) #DLL ADD_LIBRARY ( lua ${SRC_LIBLUA} ) +IF (BUILD_SHARED_LIBS) + TARGET_COMPILE_DEFINITIONS (lua PRIVATE -DLUA_BUILD_AS_DLL ) +ENDIF () + INSTALL ( TARGETS lua RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ) +IF (NOT DEFINED SKIP_INSTALL_TOOLS) + ADD_EXECUTABLE ( luac src/luac.c ${SRC_LIBLUA} ) # compiler + ADD_EXECUTABLE ( luai src/lua.c ${SRC_LIBLUA} ) # interpreter + SET_TARGET_PROPERTIES ( luai PROPERTIES OUTPUT_NAME lua PDB_NAME luai ) + INSTALL ( TARGETS luai luac RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tools ) +ENDIF () + IF (NOT DEFINED SKIP_INSTALL_HEADERS) INSTALL( FILES @@ -51,4 +58,4 @@ IF (NOT DEFINED SKIP_INSTALL_HEADERS) src/lauxlib.h DESTINATION include ) -ENDIF ()
\ No newline at end of file +ENDIF () diff --git a/ports/lua/CONTROL b/ports/lua/CONTROL index ae661f3f6..b284bfa85 100644 --- a/ports/lua/CONTROL +++ b/ports/lua/CONTROL @@ -1,3 +1,3 @@ Source: lua -Version: 5.3.3 +Version: 5.3.3-2 Description: a powerful, fast, lightweight, embeddable scripting language diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake index 598b15c94..0778a77f9 100644 --- a/ports/lua/portfile.cmake +++ b/ports/lua/portfile.cmake @@ -21,6 +21,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS_DEBUG -DSKIP_INSTALL_HEADERS=ON + -DSKIP_INSTALL_TOOLS=ON ) vcpkg_install_cmake() |