[cppmicroservices] Update to 3.6.0 (#20375)

* Update cppmicroservices to 3.6.0

* Update CI baseline

* delete Remove double quotes

* update version

Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
This commit is contained in:
chausner 2021-09-28 06:06:58 +02:00 committed by GitHub
parent 855b12bf6c
commit 30e34df2a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 11 deletions

View File

@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO "CppMicroServices/CppMicroservices"
REF b4d3d404df01d67dfd7fc36111bc5de50e1b89d6 # v3.4.0
SHA512 b4a55f7c86cae25e936a237108b82824458b123fa1c14d4e0218c72c444a6d7f0db8900409af321225ec818f5691894b01fd311c606463386e7ce8e81e3656c8
REPO CppMicroServices/CppMicroservices
REF v3.6.0
SHA512 C1407E1D3C2FD31675C32D8C00F7D005C09B03A835D5B09411B0043DDEAF5E3A1A0C7A5FA34FA04D5A643169D222D0E8D3A3C31CDA69FB64CDF1A8CCA276BE18
HEAD_REF development
PATCHES
werror.patch
@ -11,8 +11,8 @@ vcpkg_from_github(
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA # Disable this option if project cannot be built with Ninja
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
-DTOOLS_INSTALL_DIR:STRING=tools/cppmicroservices
-DAUXILIARY_INSTALL_DIR:STRING=share/cppmicroservices
@ -21,12 +21,12 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_fixup_cmake_targets()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
# CppMicroServices uses a custom resource compiler to compile resources
# the zipped resources are then appended to the target which cause the linker to crash

View File

@ -1,7 +1,6 @@
{
"name": "cppmicroservices",
"version-string": "3.4.0",
"port-version": 3,
"version": "3.6.0",
"description": "An OSGi-like C++ dynamic module system and service registry",
"homepage": "https://github.com/CppMicroServices/CppMicroServices",
"dependencies": [

View File

@ -1549,8 +1549,8 @@
"port-version": 3
},
"cppmicroservices": {
"baseline": "3.4.0",
"port-version": 3
"baseline": "3.6.0",
"port-version": 0
},
"cpprestsdk": {
"baseline": "2.10.18",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "df21454215c4d4d1106621ead01a95a199163b60",
"version": "3.6.0",
"port-version": 0
},
{
"git-tree": "0462f2f3f6c9bb3e3374b53eccc05adc00417bae",
"version-string": "3.4.0",