aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alex@karatarakis.com>2016-12-06 13:46:15 -0800
committerGitHub <noreply@github.com>2016-12-06 13:46:15 -0800
commit50a85c3159ce3e10eacdd5bc5ad3772d878afd3a (patch)
tree7fc77fadac5aa6a977c46011374bd533e1c5822a
parentaf9d82ceb34f51187ce3456b740f7c75350a139c (diff)
parentd8db19a2c469bec4db87674be1d9e63ce5959587 (diff)
downloadvcpkg-50a85c3159ce3e10eacdd5bc5ad3772d878afd3a.tar.gz
vcpkg-50a85c3159ce3e10eacdd5bc5ad3772d878afd3a.zip
Merge pull request #383 from codicodi/add-lua-tools
[lua] install compiler and interpreter
-rw-r--r--ports/lua/CMakeLists.txt9
-rw-r--r--ports/lua/CONTROL2
-rw-r--r--ports/lua/portfile.cmake1
3 files changed, 10 insertions, 2 deletions
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 ()
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
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()