diff options
| author | Nemirtingas <9432037+Nemirtingas@users.noreply.github.com> | 2021-08-05 12:09:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-05 03:09:16 -0700 |
| commit | f2e53addee85fb94e1597b438ae65767efad6288 (patch) | |
| tree | c00350b28c05a57ceb1eab2d78e2213d9ddf689b /ports/libjuice/fix-for-vcpkg.patch | |
| parent | aacdf5fd5a538d2e72470deeba8f83da3f3ef681 (diff) | |
| download | vcpkg-f2e53addee85fb94e1597b438ae65767efad6288.tar.gz vcpkg-f2e53addee85fb94e1597b438ae65767efad6288.zip | |
[libdatachannel][libjuice] Update libdatachannel to 0.14.1 and libjuice to 0.8.4. (#19305)
* Update libjuice and libdatachannel
* Update libjuice
* Update baseline
* Update libdatachannel to 0.14.1
Fixes *-uwp.
* Update baseline.
* Fix nettle discovery
* Fix usrsctp library path.
* Fix libdatachannel not being built SHARED.
* Update baseline.
Co-authored-by: Nemirtingas <nanaki89@hotmail.fr>
Diffstat (limited to 'ports/libjuice/fix-for-vcpkg.patch')
| -rw-r--r-- | ports/libjuice/fix-for-vcpkg.patch | 55 |
1 files changed, 10 insertions, 45 deletions
diff --git a/ports/libjuice/fix-for-vcpkg.patch b/ports/libjuice/fix-for-vcpkg.patch index 72ef83d0b..75ab492a0 100644 --- a/ports/libjuice/fix-for-vcpkg.patch +++ b/ports/libjuice/fix-for-vcpkg.patch @@ -1,68 +1,33 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6142f91..cfdfa40 100644 +index aedb557..89c701b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -53,6 +53,9 @@ set(LIBJUICE_SOURCES - set(LIBJUICE_HEADERS - ${CMAKE_CURRENT_SOURCE_DIR}/include/juice/juice.h - ) -+set(LIBJUICE_PRIVATE_HEADERS -+ ${CMAKE_CURRENT_SOURCE_DIR}/src/socket.h -+) - - set(TESTS_SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/test/main.c -@@ -70,10 +73,10 @@ set(TESTS_SOURCES +@@ -72,7 +72,7 @@ set(TESTS_SOURCES set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -add_library(juice SHARED ${LIBJUICE_SOURCES}) +add_library(juice ${LIBJUICE_SOURCES}) set_target_properties(juice PROPERTIES VERSION ${PROJECT_VERSION}) + target_compile_definitions(juice PRIVATE $<$<CONFIG:Release>:RELEASE=1>) --target_include_directories(juice PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) -+target_include_directories(juice PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>) - target_include_directories(juice PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/juice) - target_include_directories(juice PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) - target_link_libraries(juice PUBLIC Threads::Threads) -@@ -97,10 +100,14 @@ endif() +@@ -100,11 +100,15 @@ if(WIN32) + endif() if (USE_NETTLE) - find_package(Nettle REQUIRED) +- find_package(Nettle REQUIRED) + find_path(NETTLE_INCLUDE_PATH "nettle/hmac.h" REQUIRED) ++ find_library(NETTLE_LIBRARY_PATH NAMES nettle libnettle REQUIRED) + target_include_directories(juice PRIVATE ${NETTLE_INCLUDE_PATH}) + target_include_directories(juice-static PRIVATE ${NETTLE_INCLUDE_PATH}) + target_compile_definitions(juice PRIVATE USE_NETTLE=1) - target_link_libraries(juice PRIVATE Nettle::Nettle) -+ target_link_libraries(juice PRIVATE nettle) ++ target_link_libraries(juice PRIVATE ${NETTLE_LIBRARY_PATH}) target_compile_definitions(juice-static PRIVATE USE_NETTLE=1) - target_link_libraries(juice-static PRIVATE Nettle::Nettle) -+ target_link_libraries(juice-static PRIVATE nettle) ++ target_link_libraries(juice-static PRIVATE ${NETTLE_LIBRARY_PATH}) else() target_compile_definitions(juice PRIVATE USE_NETTLE=0) target_compile_definitions(juice-static PRIVATE USE_NETTLE=0) -@@ -125,8 +132,13 @@ endif() - add_library(LibJuice::LibJuice ALIAS juice) - add_library(LibJuice::LibJuiceStatic ALIAS juice-static) - --install(TARGETS juice LIBRARY DESTINATION lib) -+install(TARGETS juice EXPORT libjuice-config -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib -+) - install(FILES ${LIBJUICE_HEADERS} DESTINATION include/juice) -+install(FILES ${LIBJUICE_PRIVATE_HEADERS} DESTINATION include/juice/src) - - if(NOT MSVC) - target_compile_options(juice PRIVATE -Wall -Wextra) -@@ -161,3 +173,8 @@ if(NOT NO_TESTS) - target_link_libraries(juice-tests juice) - endif() - -+install( -+ EXPORT libjuice-config -+ NAMESPACE LibJuice:: -+ DESTINATION share/cmake/libjuice -+) + |