Skip to content

Commit 24a3adf

Browse files
jasminsehicarvidn
authored andcommitted
Bumping libdatachannel to latest and format issue fix
1 parent 3f603bb commit 24a3adf

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -840,16 +840,16 @@ if (webtorrent)
840840
else()
841841
option(USE_GNUTLS "Use GnuTLS instead of OpenSSL for libdatachannel" OFF)
842842
endif()
843-
843+
844844
set(LIBDATACHANNEL_STATIC ON CACHE BOOL "" FORCE)
845845
set(LIBDATACHANNEL_EXPORT OFF CACHE BOOL "" FORCE)
846846
set(LIBDATACHANNEL_INSTALL OFF CACHE BOOL "" FORCE)
847847
set(PLOG_INSTALL OFF CACHE BOOL "" FORCE)
848848
set(JUICE_INSTALL OFF CACHE BOOL "" FORCE)
849-
849+
850850
add_subdirectory(deps/libdatachannel EXCLUDE_FROM_ALL)
851851
set_target_properties(datachannel-static PROPERTIES POSITION_INDEPENDENT_CODE ON)
852-
852+
853853
if(CMAKE_CXX_COMPILER_ID MATCHES Clang|GNU)
854854
target_compile_options(datachannel-static PRIVATE
855855
-Wno-pedantic

appveyor.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ artifacts:
3232

3333
install:
3434
- git submodule update --init --recursive
35-
- ps: (Get-Content deps\libdatachannel\Jamfile) -replace 'Visual Studio 16 2019', 'Visual Studio 17 2022' | Set-Content deps\libdatachannel\Jamfile
36-
- set CMAKE_POLICY_VERSION_MINIMUM=3.5
3735
- set ROOT_DIRECTORY=%CD%
3836
- cd %ROOT_DIRECTORY%
3937
- if not defined api ( set api="desktop" )
@@ -98,7 +96,7 @@ build_script:
9896
cd %BOOST_ROOT% &&
9997
b2.exe cxxstd=17 release --with-python --with-system --layout=system address-model=64 link=shared stage &&
10098
cd %ROOT_DIRECTORY% &&
101-
cmake -B build -DBOOST_LIBRARYDIR=%BOOST_ROOT%\stage\lib -DCMAKE_CXX_STANDARD=17 -DCMAKE_POLICY_VERSION_MINIMUM="3.5" -Dbuild_tests=ON -Dbuild_examples=ON -Dbuild_tools=ON -Dwebtorrent=%webtorrent% -DOPENSSL_ROOT_DIR=%ssl_root_dir% -Dpython-bindings=%python% -Dboost-python-module-name="python" -Dskip-python-runtime-test=true -DPython_ADDITIONAL_VERSIONS="2.7" -G "Ninja Multi-Config" &&
99+
cmake -B build -DBOOST_LIBRARYDIR=%BOOST_ROOT%\stage\lib -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=ON -Dbuild_examples=ON -Dbuild_tools=ON -Dwebtorrent=%webtorrent% -DOPENSSL_ROOT_DIR=%ssl_root_dir% -Dpython-bindings=%python% -Dboost-python-module-name="python" -Dskip-python-runtime-test=true -DPython_ADDITIONAL_VERSIONS="2.7" -G "Ninja Multi-Config" &&
102100
cmake --build build --config Release --parallel %NUMBER_OF_PROCESSORS%
103101
)
104102

deps/libdatachannel

Submodule libdatachannel updated 130 files

0 commit comments

Comments
 (0)