aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLily <47812810+LilyWangL@users.noreply.github.com>2020-10-28 11:29:12 +0800
committerGitHub <noreply@github.com>2020-10-27 20:29:12 -0700
commit83ff32536aafdf99a8624d158384f27929c1888f (patch)
treedd8f926c5caede067c9c0425bc9cda3d988fdac6
parent10771a845e5cd7ee07a8fe367188f19bb722864b (diff)
downloadvcpkg-83ff32536aafdf99a8624d158384f27929c1888f.tar.gz
vcpkg-83ff32536aafdf99a8624d158384f27929c1888f.zip
[lua] Fix find_package warning (#13195)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
-rw-r--r--ports/lua/CONTROL3
-rw-r--r--ports/lua/portfile.cmake2
-rw-r--r--ports/lua/usage2
3 files changed, 4 insertions, 3 deletions
diff --git a/ports/lua/CONTROL b/ports/lua/CONTROL
index 72839f972..1ffec4aa3 100644
--- a/ports/lua/CONTROL
+++ b/ports/lua/CONTROL
@@ -1,5 +1,6 @@
Source: lua
-Version: 5.3.5-5
+Version: 5.3.5
+Port-Version: 6
Homepage: https://www.lua.org
Description: a powerful, fast, lightweight, embeddable scripting language
diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake
index 823bd6555..cc3c07465 100644
--- a/ports/lua/portfile.cmake
+++ b/ports/lua/portfile.cmake
@@ -44,7 +44,7 @@ vcpkg_copy_pdbs()
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/lua)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
- if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
+ if(VCPKG_TARGET_IS_WINDOWS)
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}")
file(WRITE ${CURRENT_PACKAGES_DIR}/include/luaconf.h "${LUA_CONF_H}")
diff --git a/ports/lua/usage b/ports/lua/usage
index 8a11e20b9..e27f6392d 100644
--- a/ports/lua/usage
+++ b/ports/lua/usage
@@ -1,7 +1,7 @@
Use this package via the module FindLua that comes with CMake. To use in your CMakeLists.txt:
include(FindLua)
- find_package(lua REQUIRED)
+ find_package(Lua REQUIRED)
target_link_libraries(main PRIVATE ${LUA_LIBRARIES})
target_include_directories(main PRIVATE ${LUA_INCLUDE_DIR})