mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-12 15:09:01 +08:00
578406cc8b
* [libdatachannel] chore(version): updated to 0.17.7 * [libdatachannel] chore(version): updated to 0.17.7 version * [libdatachannel] chore(version): updated to 0.17.7 version sha * update version * [libdatachannel] update version to 0.17.8 * del version * update version * format patch * overwrite version Co-authored-by: FrankXie <v-frankxie@microsoft.com>
62 lines
2.4 KiB
Diff
62 lines
2.4 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 28b4566..4347b6a 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -28,7 +28,6 @@ endif()
|
|
|
|
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
|
|
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
|
-set(BUILD_SHARED_LIBS OFF) # to force usrsctp to be built static
|
|
|
|
if(WIN32)
|
|
add_definitions(-DWIN32_LEAN_AND_MEAN)
|
|
@@ -200,12 +199,14 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
|
|
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
|
|
find_package(Threads REQUIRED)
|
|
|
|
-set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
|
|
-add_subdirectory(deps/plog EXCLUDE_FROM_ALL)
|
|
+find_library(USRSCTP_LIBRARY usrsctp REQUIRED)
|
|
+find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h")
|
|
|
|
if(SCTP_DEBUG)
|
|
add_definitions(-DSCTP_DEBUG)
|
|
endif()
|
|
+
|
|
+if(0)
|
|
option(sctp_build_shared_lib OFF)
|
|
option(sctp_build_programs OFF)
|
|
option(sctp_inet OFF)
|
|
@@ -219,8 +220,9 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
|
|
target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation)
|
|
endif()
|
|
add_library(Usrsctp::Usrsctp ALIAS usrsctp)
|
|
+endif()
|
|
|
|
-add_library(datachannel SHARED
|
|
+add_library(datachannel
|
|
${LIBDATACHANNEL_SOURCES}
|
|
${LIBDATACHANNEL_HEADERS}
|
|
${LIBDATACHANNEL_IMPL_SOURCES}
|
|
@@ -244,16 +246,18 @@ target_include_directories(datachannel PUBLIC
|
|
$<INSTALL_INTERFACE:include>)
|
|
target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
|
|
target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
|
|
+target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS})
|
|
target_link_libraries(datachannel PRIVATE Threads::Threads)
|
|
-target_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp plog::plog)
|
|
+target_link_libraries(datachannel PRIVATE ${USRSCTP_LIBRARY})
|
|
|
|
target_include_directories(datachannel-static PUBLIC
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
|
$<INSTALL_INTERFACE:include>)
|
|
target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
|
|
target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
|
|
+target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS})
|
|
target_link_libraries(datachannel-static PRIVATE Threads::Threads)
|
|
-target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp plog::plog)
|
|
+target_link_libraries(datachannel-static PRIVATE ${USRSCTP_LIBRARY})
|
|
|
|
if(WIN32)
|
|
target_link_libraries(datachannel PUBLIC ws2_32) # winsock2
|