diff --git a/ports/libfabric/portfile.cmake b/ports/libfabric/portfile.cmake index 03b2ec3fa8..b87a10ba75 100644 --- a/ports/libfabric/portfile.cmake +++ b/ports/libfabric/portfile.cmake @@ -13,24 +13,16 @@ vcpkg_from_github( set(LIBFABRIC_RELEASE_CONFIGURATION "Release-v142") set(LIBFABRIC_DEBUG_CONFIGURATION "Debug-v142") -vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH libfabric.vcxproj - INCLUDES_SUBPATH include - LICENSE_SUBPATH COPYING PLATFORM "x64" RELEASE_CONFIGURATION ${LIBFABRIC_RELEASE_CONFIGURATION} - DEBUG_CONFIGURATION ${LIBFABRIC_RELEASE_CONFIGURATION} - USE_VCPKG_INTEGRATION - ALLOW_ROOT_INCLUDES + DEBUG_CONFIGURATION ${LIBFABRIC_DEBUG_CONFIGURATION} OPTIONS /p:SolutionDir=${SOURCE_PATH} - /p:AdditionalIncludeDirectories="${CURRENT_INSTALLED_DIR}/include" ) -#Move includes under subdirectory to avoid colisions with other libraries -file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/includetemp") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") -file(RENAME "${CURRENT_PACKAGES_DIR}/includetemp" "${CURRENT_PACKAGES_DIR}/include/libfabric") +file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/libfabric") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libfabric/vcpkg.json b/ports/libfabric/vcpkg.json index 547c77e3c2..3478c994c6 100644 --- a/ports/libfabric/vcpkg.json +++ b/ports/libfabric/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libfabric", "version-semver": "1.13.2", - "port-version": 1, + "port-version": 2, "description": "The OpenFabrics Interfaces Working Group (OFIWG) and the Libfabric open-source community are pleased to announce the release of version v1.6.2 of libfabric. See NEWS.md for the list of features and enhancements that have been added since the last release.", "homepage": "https://github.com/ofiwg/libfabric", "supports": "windows & !uwp & x64 & !static", @@ -9,6 +9,11 @@ { "name": "networkdirect-sdk", "platform": "windows" + }, + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 7cc9e14429..6323f0f171 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4086,7 +4086,7 @@ }, "libfabric": { "baseline": "1.13.2", - "port-version": 1 + "port-version": 2 }, "libffi": { "baseline": "3.4.4", diff --git a/versions/l-/libfabric.json b/versions/l-/libfabric.json index f12f77fad1..913c910632 100644 --- a/versions/l-/libfabric.json +++ b/versions/l-/libfabric.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19c6e0eeaef3d31e6a2f722a99d418bc03275f1a", + "version-semver": "1.13.2", + "port-version": 2 + }, { "git-tree": "d0a766bd1f01a742dcc12e13bafd741b94d7a3c0", "version-semver": "1.13.2",