From 1808d461b0e8793445b87eb8ceed71d5ac7aca6e Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 8 Nov 2016 14:25:47 -0800 Subject: triplet is now automatically included before portfiles. Also remove trailing whitespaces from portfiles --- ports/lua/portfile.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'ports/lua') diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake index f8c1071f7..598b15c94 100644 --- a/ports/lua/portfile.cmake +++ b/ports/lua/portfile.cmake @@ -6,7 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lua-5.3.3) vcpkg_download_distfile(ARCHIVE -- cgit v1.2.3 From fd74c49a5f9b8b2f5e20b82fe19ea273a8820eaa Mon Sep 17 00:00:00 2001 From: codicodi Date: Sun, 4 Dec 2016 19:11:01 +0100 Subject: [lua] add interpreter and compiler --- ports/lua/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'ports/lua') diff --git a/ports/lua/CMakeLists.txt b/ports/lua/CMakeLists.txt index 76ee6e15c..f929c41c9 100644 --- a/ports/lua/CMakeLists.txt +++ b/ports/lua/CMakeLists.txt @@ -41,6 +41,13 @@ INSTALL ( TARGETS lua 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 () -- cgit v1.2.3 From fffc1dc71eb612b8e85ac5529df6913b0d6c2a4d Mon Sep 17 00:00:00 2001 From: codicodi Date: Sun, 4 Dec 2016 19:12:21 +0100 Subject: [lua] no debug tools --- ports/lua/portfile.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'ports/lua') 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() -- cgit v1.2.3 From d8db19a2c469bec4db87674be1d9e63ce5959587 Mon Sep 17 00:00:00 2001 From: codicodi Date: Mon, 5 Dec 2016 14:40:10 +0100 Subject: [lua] bump version --- ports/lua/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ports/lua') diff --git a/ports/lua/CONTROL b/ports/lua/CONTROL index ae661f3f6..ca2a82b14 100644 --- a/ports/lua/CONTROL +++ b/ports/lua/CONTROL @@ -1,3 +1,3 @@ Source: lua -Version: 5.3.3 +Version: 5.3.3-1 Description: a powerful, fast, lightweight, embeddable scripting language -- cgit v1.2.3 From 3d58393ad2ee3d0b33fc202f60d22a327928c403 Mon Sep 17 00:00:00 2001 From: codicodi Date: Sat, 24 Dec 2016 02:02:55 +0100 Subject: [lua] don't export from executables --- ports/lua/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ports/lua') diff --git a/ports/lua/CMakeLists.txt b/ports/lua/CMakeLists.txt index f929c41c9..68de76788 100644 --- a/ports/lua/CMakeLists.txt +++ b/ports/lua/CMakeLists.txt @@ -25,16 +25,16 @@ 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 -- cgit v1.2.3 From 90d814f3e28e64542a9a3cc65c99a94286cbdee2 Mon Sep 17 00:00:00 2001 From: codicodi Date: Sat, 24 Dec 2016 02:03:25 +0100 Subject: [lua] bump version --- ports/lua/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ports/lua') diff --git a/ports/lua/CONTROL b/ports/lua/CONTROL index ca2a82b14..b284bfa85 100644 --- a/ports/lua/CONTROL +++ b/ports/lua/CONTROL @@ -1,3 +1,3 @@ Source: lua -Version: 5.3.3-1 +Version: 5.3.3-2 Description: a powerful, fast, lightweight, embeddable scripting language -- cgit v1.2.3