mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-11 16:49:02 +08:00
a83d2315aa
Fixes https://github.com/microsoft/vcpkg/issues/39318 1.Delete tools(quicping,quicreach) that do not exist. 2. Fix the issue that afxdp_helper.h file does not exist during compilation. 3. Remove patches fix-platform.patch and fix-warnings.patch that have been fixed upstream.
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 0c89c5c..98bb1a6 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -752,6 +752,8 @@ add_subdirectory(src/bin)
|
|
# Tool code
|
|
if(QUIC_BUILD_TOOLS)
|
|
add_subdirectory(src/tools)
|
|
+ install(TARGETS quicattack quicinterop quicinteropserver quicipclient quicipserver
|
|
+ quicpcp quicpost quicsample spinquic)
|
|
endif()
|
|
|
|
# Performance code
|
|
diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
|
|
index 2376823..d0592a3 100644
|
|
--- a/src/bin/CMakeLists.txt
|
|
+++ b/src/bin/CMakeLists.txt
|
|
@@ -253,14 +253,14 @@ endif()
|
|
if(BUILD_SHARED_LIBS)
|
|
target_include_directories(msquic PUBLIC
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc>
|
|
- $<INSTALL_INTERFACE:${include_dest}>)
|
|
+ $<INSTALL_INTERFACE:include>)
|
|
else()
|
|
target_include_directories(msquic_static INTERFACE
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc>
|
|
- $<INSTALL_INTERFACE:${include_dest}>)
|
|
+ $<INSTALL_INTERFACE:include>)
|
|
target_include_directories(msquic INTERFACE
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc>
|
|
- $<INSTALL_INTERFACE:${include_dest}>)
|
|
+ $<INSTALL_INTERFACE:include>)
|
|
endif()
|
|
|
|
set(PUBLIC_HEADERS
|
|
@@ -269,11 +269,10 @@ set(PUBLIC_HEADERS
|
|
../inc/msquic_posix.h
|
|
../inc/quic_sal_stub.h)
|
|
|
|
-if(BUILD_SHARED_LIBS)
|
|
- install(TARGETS msquic EXPORT msquic DESTINATION lib)
|
|
-else()
|
|
- install(FILES ${QUIC_STATIC_LIBRARY} DESTINATION lib)
|
|
-endif()
|
|
+install(TARGETS msquic EXPORT msquic
|
|
+ RUNTIME DESTINATION bin
|
|
+ ARCHIVE DESTINATION lib
|
|
+ LIBRARY DESTINATION lib)
|
|
install(FILES ${PUBLIC_HEADERS} DESTINATION include)
|
|
|
|
configure_file(msquic-config.cmake.in ${CMAKE_BINARY_DIR}/msquic-config.cmake)
|