aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2021-08-19 08:18:05 +0800
committerGitHub <noreply@github.com>2021-08-18 17:18:05 -0700
commitc721ff67847649837274dfe3ee4cb658dc57baa1 (patch)
treec2aedc9087f67067b121bce31c1f808307fdd266
parentf0da48d233a260e40a65083cdcc5b6b1e9d02e29 (diff)
downloadvcpkg-c721ff67847649837274dfe3ee4cb658dc57baa1.tar.gz
vcpkg-c721ff67847649837274dfe3ee4cb658dc57baa1.zip
[lua] Add error message to feature `cpp` when building uwp (#19510)
* [lua] Add error message to the cpp selection feature when building uwp. * version
-rw-r--r--ports/lua/portfile.cmake3
-rw-r--r--ports/lua/vcpkg.json2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/l-/lua.json5
4 files changed, 10 insertions, 2 deletions
diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake
index 89097096c..1a7fac53c 100644
--- a/ports/lua/portfile.cmake
+++ b/ports/lua/portfile.cmake
@@ -16,6 +16,9 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
# Used in cmake wrapper
set(ENABLE_LUA_CPP 0)
if ("cpp" IN_LIST FEATURES)
+ if (VCPKG_TARGET_IS_UWP)
+ message(FATAL_ERROR "Feature cpp does not support uwp.")
+ endif()
set(ENABLE_LUA_CPP 1)
endif()
diff --git a/ports/lua/vcpkg.json b/ports/lua/vcpkg.json
index 02dc73117..e381a077e 100644
--- a/ports/lua/vcpkg.json
+++ b/ports/lua/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "lua",
"version-semver": "5.4.3",
- "port-version": 2,
+ "port-version": 3,
"description": "A powerful, fast, lightweight, embeddable scripting language",
"homepage": "https://www.lua.org",
"features": {
diff --git a/versions/baseline.json b/versions/baseline.json
index dfa6f21d0..01181049e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3890,7 +3890,7 @@
},
"lua": {
"baseline": "5.4.3",
- "port-version": 2
+ "port-version": 3
},
"luabridge": {
"baseline": "2.6",
diff --git a/versions/l-/lua.json b/versions/l-/lua.json
index 930b81157..b54786308 100644
--- a/versions/l-/lua.json
+++ b/versions/l-/lua.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "6a9a787a9369019f1dd867cc1c1d6c10296441d9",
+ "version-semver": "5.4.3",
+ "port-version": 3
+ },
+ {
"git-tree": "3be47dc8a0f0e6497caac10e26e2eaf8866b2990",
"version-semver": "5.4.3",
"port-version": 2