Fixup

microsoft · Dec 23, 2024 · 62e1584 · 62e1584
1 parent dee25b8
commit 62e1584
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/ports/msh3/dependencies_fix.patch b/ports/msh3/dependencies_fix.patch
@@ -22,7 +22,7 @@ index d8a81ab..edf5651 100644
 
  # Configure and build msquic dependency.
  if (WIN32)
-@@ -76,9 +74,13 @@ else()
+@@ -76,9 +74,11 @@ else()
  endif()
  set(QUIC_BUILD_SHARED ON CACHE BOOL "Builds MsQuic as a dynamic library")
  set(QUIC_ENABLE_LOGGING ON CACHE BOOL "Enable MsQuic logging")
@@ -34,24 +34,23 @@ index d8a81ab..edf5651 100644
 +add_library(inc ALIAS msquic)
 +add_library(platform ALIAS msquic)
 +add_library(warnings ALIAS msquic)
-+
-+target_compile_features(msh3_headers INTERFACE cxx_std_20)
 
  # Build msh3 library (and cmd line tool).
  add_subdirectory(lib)
 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
 index 4d7aeb7..6da8e1a 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
-@@ -7,6 +7,7 @@ else()
+@@ -7,6 +7,8 @@ else()
      set(SOURCES msh3.cpp)
  endif()
  add_library(msh3 SHARED ${SOURCES})
++target_compile_features(msh3 PRIVATE cxx_std_20)
 +target_include_directories(msh3 PUBLIC $<INSTALL_INTERFACE:include>)
  target_link_libraries(msh3 PRIVATE inc warnings msquic ls-qpack msh3_headers)
  if (NOT BUILD_SHARED_LIBS)
      target_link_libraries(msh3 PRIVATE base_link)
-@@ -24,12 +25,16 @@ elseif (CX_PLATFORM STREQUAL "darwin")
+@@ -24,12 +26,16 @@ elseif (CX_PLATFORM STREQUAL "darwin")
          PROPERTIES LINK_FLAGS "-exported_symbols_list \"${CMAKE_CURRENT_SOURCE_DIR}/darwin/exports.txt\"")
  endif()
 

diff --git a/ports/msquic/fix-install.patch b/ports/msquic/fix-install.patch
@@ -6,7 +6,7 @@ index 18048e3..4fcd161 100644
 
  if(BUILD_SHARED_LIBS)
      add_library(msquic SHARED ${SOURCES})
-+    target_include_directories(msquic PRIVATE $<INSTALL_INTERFACE:include>)
++    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})
      if (NOT WIN32)

diff --git a/versions/m-/msh3.json b/versions/m-/msh3.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "64b3cb0979ea4ddaaad91d328829192482578cb4",
+      "git-tree": "32112fdb5245ab8574dd65f981fa79ee6e6ed5d7",
       "version": "0.7.0",
       "port-version": 0
     },

diff --git a/versions/m-/msquic.json b/versions/m-/msquic.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "7dcb7f5461e6fccce544be80c9ad84b20cfabfbb",
+      "git-tree": "04855f9144f78f05b623916dc4d7310fdf8b5d29",
       "version": "2.4.7",
       "port-version": 0
     },