Skip to content

Commit

Permalink
Namespaced msquic targets [skip actions]
Browse files Browse the repository at this point in the history
  • Loading branch information
dg0yt committed Jan 5, 2025
1 parent 74974d6 commit 7505fa0
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 0 deletions.
16 changes: 16 additions & 0 deletions ports/msh3/msquic-targets.diff
Original file line number Diff line number Diff line change
@@ -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
$<BUILD_INTERFACE:${msh3_SOURCE_DIR}>
$<INSTALL_INTERFACE:include>
)
-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)
1 change: 1 addition & 0 deletions ports/msh3/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ vcpkg_from_github(
HEAD_REF main
PATCHES
win32-crt.diff
msquic-targets.diff
)

vcpkg_cmake_configure(
Expand Down
1 change: 1 addition & 0 deletions ports/msquic/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
45 changes: 45 additions & 0 deletions ports/msquic/target-names.diff
Original file line number Diff line number Diff line change
@@ -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 $<INSTALL_INTERFACE:include>)
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(

0 comments on commit 7505fa0

Please sign in to comment.