Merge remote-tracking branch 'origin/master' into better-account
This commit is contained in:
commit
b76ddb7647
79 changed files with 1606 additions and 671 deletions
2
externals/CMakeLists.txt
vendored
2
externals/CMakeLists.txt
vendored
|
@ -32,7 +32,7 @@ add_subdirectory(inih)
|
|||
|
||||
# lz4
|
||||
set(LZ4_BUNDLED_MODE ON)
|
||||
add_subdirectory(lz4/contrib/cmake_unofficial)
|
||||
add_subdirectory(lz4/contrib/cmake_unofficial EXCLUDE_FROM_ALL)
|
||||
target_include_directories(lz4_static INTERFACE ./lz4/lib)
|
||||
|
||||
# mbedtls
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue