diff --git a/ports/msh3/msquic-targets.diff b/ports/msh3/msquic-targets.diff new file mode 100644 index 00000000000000..ac2ce396bbc228 --- /dev/null +++ b/ports/msh3/msquic-targets.diff @@ -0,0 +1,16 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 1b2a33d..228bf5d 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -16,9 +16,9 @@ target_include_directories(msh3 PUBLIC + $ + $ + ) +-target_link_libraries(msh3 PRIVATE msquic msquic_platform ls-qpack::ls-qpack) ++target_link_libraries(msh3 PRIVATE msquic::msquic msquic::platform ls-qpack::ls-qpack) + if (NOT BUILD_SHARED_LIBS) +- target_link_libraries(msh3 PRIVATE base_link) ++ target_link_libraries(msh3 PRIVATE msquic::base_link) + endif() + + if(WIN32) diff --git a/ports/msh3/portfile.cmake b/ports/msh3/portfile.cmake index 8cff4a9d3d1a95..50b6af9673117b 100644 --- a/ports/msh3/portfile.cmake +++ b/ports/msh3/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF main PATCHES win32-crt.diff + msquic-targets.diff ) vcpkg_cmake_configure( diff --git a/ports/msquic/portfile.cmake b/ports/msquic/portfile.cmake index f296c8092824c3..9b474f2e0c1f5a 100644 --- a/ports/msquic/portfile.cmake +++ b/ports/msquic/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( fix-uwp-crt.patch # https://github.com/microsoft/msquic/pull/4373 fix-comparing-system-processor-with-win32.patch # https://github.com/microsoft/msquic/pull/4374 uwp-link-libs.diff + target-names.diff ) vcpkg_from_github( diff --git a/ports/msquic/target-names.diff b/ports/msquic/target-names.diff new file mode 100644 index 00000000000000..6b3f549a172259 --- /dev/null +++ b/ports/msquic/target-names.diff @@ -0,0 +1,45 @@ +diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt +index e69cf51ac..f9fffce61 100644 +--- a/src/bin/CMakeLists.txt ++++ b/src/bin/CMakeLists.txt +@@ -11,6 +11,7 @@ endif() + + if(BUILD_SHARED_LIBS) + add_library(msquic SHARED ${SOURCES}) ++ add_library(msquic::msquic ALIAS msquic) + target_include_directories(msquic PUBLIC $) + target_link_libraries(msquic PRIVATE core msquic_platform inc warnings logging base_link main_binary_link_args) + set_target_properties(msquic PROPERTIES OUTPUT_NAME ${QUIC_LIBRARY_NAME}) +diff --git a/src/bin/msquic-config.cmake.in b/src/bin/msquic-config.cmake.in +index e61e63fea..f9d17c5e7 100644 +--- a/src/bin/msquic-config.cmake.in ++++ b/src/bin/msquic-config.cmake.in +@@ -2,8 +2,10 @@ include(CMakeFindDependencyMacro) + + include("${CMAKE_CURRENT_LIST_DIR}/msquic.cmake") + +-foreach(_t IN ITEMS msquic msquic_platform) +- if(TARGET msquic::${_t} AND NOT TARGET ${_t}) +- add_library(${_t} ALIAS msquic::${_t}) +- endif() +-endforeach() ++# Legacy names ++if(NOT TARGET msquic) ++ add_library(msquic ALIAS msquic::msquic) ++endif() ++if(NOT TARGET msquic_platform) ++ add_library(msquic_platform ALIAS msquic::platform) ++endif() +diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt +index 997906d0c..61c898a8a 100644 +--- a/src/platform/CMakeLists.txt ++++ b/src/platform/CMakeLists.txt +@@ -60,6 +60,8 @@ else() + endif() + + add_library(msquic_platform STATIC ${SOURCES}) ++add_library(msquic::platform ALIAS msquic_platform) ++set_target_properties(msquic_platform PROPERTIES EXPORT_NAME platform) + + if("${CX_PLATFORM}" STREQUAL "windows") + target_link_libraries(