mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 10:19:02 +08:00
f2e53addee
* 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>
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index aedb557..89c701b 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -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>)
|
|
|
|
@@ -100,11 +100,15 @@ if(WIN32)
|
|
endif()
|
|
|
|
if (USE_NETTLE)
|
|
- 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_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_LIBRARY_PATH})
|
|
else()
|
|
target_compile_definitions(juice PRIVATE USE_NETTLE=0)
|
|
target_compile_definitions(juice-static PRIVATE USE_NETTLE=0)
|
|
|