Always build bundled libb64 and libutp libraries as static (#4810)

This commit is contained in:
Mike Gelfand
2023-02-11 03:08:55 +03:00
committed by GitHub
parent 42a01068c6
commit 39acf93f1a
4 changed files with 13 additions and 4 deletions

View File

@@ -497,12 +497,16 @@ tr_add_external_auto_library(PSL libpsl psl
if(ENABLE_UTP)
tr_add_external_auto_library(UTP libutp utp
SUBPROJECT
TARGET libutp::libutp)
TARGET libutp::libutp
CMAKE_ARGS
-DLIBUTP_SHARED:BOOL=OFF)
endif()
tr_add_external_auto_library(B64 libb64 b64
SUBPROJECT
TARGET libb64::libb64)
TARGET libb64::libb64
CMAKE_ARGS
-DLIBB64_SHARED:BOOL=OFF)
if(NOT ${REBUILD_WEB} STREQUAL "OFF")
find_program(NPM npm)

View File

@@ -140,6 +140,11 @@ macro(tr_add_external_auto_library ID DIRNAME LIBNAME)
if(USE_SYSTEM_${ID})
unset(${ID}_UPSTREAM_TARGET)
elseif(_TAEAL_ARG_SUBPROJECT)
foreach(ARG IN LISTS _TAEAL_ARG_CMAKE_ARGS)
if(ARG MATCHES "^-D([^=: ]+)(:[^= ]+)?=(.*)$")
set(${CMAKE_MATCH_1} ${CMAKE_MATCH_3} CACHE INTERNAL "")
endif()
endforeach()
add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/${DIRNAME}" "${CMAKE_BINARY_DIR}/third-party/${DIRNAME}")
else()
set(${ID}_UPSTREAM_TARGET ${LIBNAME})