[bond] no absolute paths (#21732)

This commit is contained in:
autoantwort 2021-11-30 02:02:49 +01:00 committed by GitHub
parent 793256e0f2
commit 2ccde9901c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 12 deletions

View File

@ -19,7 +19,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
) )
# Clear the generator to prevent it from updating # Clear the generator to prevent it from updating
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/tools/) file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/tools/")
# Extract the precompiled gbc # Extract the precompiled gbc
vcpkg_extract_source_archive(extracted_tool_dir ARCHIVE "${GBC_ARCHIVE}" NO_REMOVE_ONE_LEVEL) vcpkg_extract_source_archive(extracted_tool_dir ARCHIVE "${GBC_ARCHIVE}" NO_REMOVE_ONE_LEVEL)
file(RENAME "${extracted_tool_dir}" "${CURRENT_BUILDTREES_DIR}/tools") file(RENAME "${extracted_tool_dir}" "${CURRENT_BUILDTREES_DIR}/tools")
@ -41,9 +41,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
bond-over-grpc BOND_ENABLE_GRPC bond-over-grpc BOND_ENABLE_GRPC
) )
vcpkg_configure_cmake( vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA DISABLE_PARALLEL_CONFIGURE
OPTIONS OPTIONS
-DBOND_LIBRARIES_ONLY=TRUE -DBOND_LIBRARIES_ONLY=TRUE
-DBOND_GBC_PATH=${FETCHED_GBC_PATH} -DBOND_GBC_PATH=${FETCHED_GBC_PATH}
@ -54,16 +54,21 @@ vcpkg_configure_cmake(
${FEATURE_OPTIONS} ${FEATURE_OPTIONS}
) )
vcpkg_install_cmake() vcpkg_cmake_install()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/bond TARGET_PATH share/bond) vcpkg_cmake_config_fixup(CONFIG_PATH lib/bond)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
cmake_path(NATIVE_PATH SOURCE_PATH native_source_path)
foreach(header bond_apply.h bond_const_apply.h bond_const_enum.h bond_const_reflection.h bond_const_types.h bond_enum.h bond_reflection.h bond_types.h)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/bond/core/${header}" "${native_source_path}" "")
endforeach()
# There's no way to supress installation of the headers in the debug build, # There's no way to supress installation of the headers in the debug build,
# so we just delete them. # so we just delete them.
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Put the license file where vcpkg expects it # Put the license file where vcpkg expects it
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)

View File

@ -1,7 +1,7 @@
{ {
"name": "bond", "name": "bond",
"version": "9.0.3", "version": "9.0.3",
"port-version": 2, "port-version": 3,
"description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.", "description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.",
"homepage": "https://github.com/Microsoft/bond", "homepage": "https://github.com/Microsoft/bond",
"dependencies": [ "dependencies": [
@ -9,7 +9,15 @@
"boost-config", "boost-config",
"boost-locale", "boost-locale",
"boost-utility", "boost-utility",
"rapidjson" "rapidjson",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
], ],
"features": { "features": {
"bond-over-grpc": { "bond-over-grpc": {

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "96ecc1c6ea2a8fabfbdfd7d0a8535821446af89f",
"version": "9.0.3",
"port-version": 3
},
{ {
"git-tree": "a1dbc5726734016b562a6f957ae3072df17b4592", "git-tree": "a1dbc5726734016b562a6f957ae3072df17b4592",
"version": "9.0.3", "version": "9.0.3",

View File

@ -514,7 +514,7 @@
}, },
"bond": { "bond": {
"baseline": "9.0.3", "baseline": "9.0.3",
"port-version": 2 "port-version": 3
}, },
"boolinq": { "boolinq": {
"baseline": "3.0.2", "baseline": "3.0.2",