[sol2] update to 3.3.0 (#25446)

* [sol2] update to 3.3.0

* update version

* adopt the requests

* overwrite version
This commit is contained in:
Frank 2022-06-28 02:47:49 +08:00 committed by GitHub
parent c168ce4e76
commit 7f34372322
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 21 deletions

View File

@ -1,10 +1,10 @@
diff --git a/cmake/sol2-config.cmake.in b/cmake/sol2-config.cmake.in
index 70c448d..7965bc6 100644
index 0c48a99..62930db 100644
--- a/cmake/sol2-config.cmake.in
+++ b/cmake/sol2-config.cmake.in
@@ -26,11 +26,11 @@ include("${CMAKE_CURRENT_LIST_DIR}/sol2-targets.cmake")
@@ -24,9 +24,9 @@
MESSAGE(STATUS ${CMAKE_CURRENT_LIST_DIR})
include("${CMAKE_CURRENT_LIST_DIR}/sol2-targets.cmake")
-if (TARGET sol2)
+if (TARGET sol2::sol2)
@ -15,5 +15,3 @@ index 70c448d..7965bc6 100644
- set(SOL2_LIBRARIES sol2)
+ set(SOL2_LIBRARIES sol2::sol2)
endif()
if(TARGET sol2_single)

View File

@ -1,29 +1,28 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ThePhD/sol2
REF v3.2.2
SHA512 e5a739b37aea7150f141f6a003c2689dd33155feed5bb3cf2569abbfe9f0062eacdaaf346be523d627f0e491b35e68822c80e1117fa09ece8c9d8d5af09fdbec
REF eba86625b707e3c8c99bbfc4624e51f42dc9e561 #v3.3.0
SHA512 a1fbcb4efd9a8b8b97c351e90499644aea72a3db62c258e219a2912853936b76870b51e69d835c14cbf1a20733673ba474e259a0243fec419c411b995cd1511d
HEAD_REF develop
PATCHES fix-namespace.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sol2)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sol2)
file(
REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug
${CURRENT_PACKAGES_DIR}/lib
${CURRENT_PACKAGES_DIR}/include
"${CURRENT_PACKAGES_DIR}/debug"
"${CURRENT_PACKAGES_DIR}/lib"
"${CURRENT_PACKAGES_DIR}/include"
)
file(INSTALL ${SOURCE_PATH}/single/include/sol DESTINATION ${CURRENT_PACKAGES_DIR}/include/)
file(INSTALL "${SOURCE_PATH}/include/sol" DESTINATION "${CURRENT_PACKAGES_DIR}/include/")
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_fixup_pkgconfig()

View File

@ -1,13 +1,21 @@
{
"name": "sol2",
"version-string": "3.2.2",
"port-version": 2,
"version": "3.3.0",
"description": "Sol v2.0 - a C++ <-> Lua API wrapper with advanced features and top notch performance - is here, and it's great",
"homepage": "https://github.com/ThePhD/sol2",
"license": "MIT",
"dependencies": [
{
"name": "lua",
"platform": "windows"
},
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -6673,8 +6673,8 @@
"port-version": 1
},
"sol2": {
"baseline": "3.2.2",
"port-version": 2
"baseline": "3.3.0",
"port-version": 0
},
"solid3": {
"baseline": "3.5.8",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "115cb8217bb876cfb71fadec889faa25954db8b1",
"version": "3.3.0",
"port-version": 0
},
{
"git-tree": "fca1a728c9f2ff6db12a00fafeae82f69a903b48",
"version-string": "3.2.2",