tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix MSVC LTO build by splitting tdcore target.

Browse Source
This commit is contained in:
levlam 2024-05-20 00:03:06 +03:00
parent 7739c371e5
commit 7709da3f44
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMake/GeneratePkgConfig.cmake
View File

@ -27,6 +27,7 @@ function(get_relative_link OUTPUT PATH)
set(${OUTPUT} "${LINK}" PARENT_SCOPE) set(${OUTPUT} "${LINK}" PARENT_SCOPE)
endfunction() endfunction()
# TODO: support interface libraries in dependencies
function(generate_pkgconfig TARGET DESCRIPTION) function(generate_pkgconfig TARGET DESCRIPTION)
# message("Generating pkg-config for ${TARGET}") # message("Generating pkg-config for ${TARGET}")
get_filename_component(PREFIX "${CMAKE_INSTALL_PREFIX}" REALPATH) get_filename_component(PREFIX "${CMAKE_INSTALL_PREFIX}" REALPATH)

27
CMakeLists.txt
View File

@ -318,7 +318,7 @@ set(TD_MTPROTO_SOURCE
td/tl/tl_object_store.h td/tl/tl_object_store.h
) )
set(TDLIB_SOURCE set(TDLIB_SOURCE_PART1
td/telegram/AccountManager.cpp td/telegram/AccountManager.cpp
td/telegram/AnimationsManager.cpp td/telegram/AnimationsManager.cpp
td/telegram/Application.cpp td/telegram/Application.cpp
@ -471,6 +471,8 @@ set(TDLIB_SOURCE
td/telegram/MessageViewer.cpp td/telegram/MessageViewer.cpp
td/telegram/misc.cpp td/telegram/misc.cpp
td/telegram/MissingInvitee.cpp td/telegram/MissingInvitee.cpp
)
set(TDLIB_SOURCE_PART2
td/telegram/net/AuthDataShared.cpp td/telegram/net/AuthDataShared.cpp
td/telegram/net/ConnectionCreator.cpp td/telegram/net/ConnectionCreator.cpp
td/telegram/net/DcAuthManager.cpp td/telegram/net/DcAuthManager.cpp
@ -1016,6 +1018,10 @@ set(TDLIB_SOURCE
${CMAKE_CURRENT_BINARY_DIR}/td/telegram/GitCommitHash.cpp ${CMAKE_CURRENT_BINARY_DIR}/td/telegram/GitCommitHash.cpp
) )
set(TDLIB_SOURCE
${TDLIB_SOURCE_PART1}
${TDLIB_SOURCE_PART2}
)
set(MEMPROF_SOURCE set(MEMPROF_SOURCE
memprof/memprof.cpp memprof/memprof.cpp
@ -1079,10 +1085,27 @@ if (WIN32)
endif() endif()
# tdcore - mostly internal TDLib interface. One should use tdactor for interactions with it. # tdcore - mostly internal TDLib interface. One should use tdactor for interactions with it.
if (MSVC AND TD_ENABLE_LTO)
add_library(tdcore_part1 STATIC ${TDLIB_SOURCE_PART1})
target_include_directories(tdcore_part1 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
target_link_libraries(tdcore_part1 PUBLIC tdapi tdnet tddb tdactor tdutils PRIVATE tdmtproto)
add_library(tdcore_part2 STATIC ${TDLIB_SOURCE_PART2})
target_include_directories(tdcore_part2 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
target_link_libraries(tdcore_part2 PUBLIC tdapi tdnet tddb tdactor tdutils PRIVATE tdmtproto)
add_library(tdcore INTERFACE)
target_link_libraries(tdcore INTERFACE tdcore_part1 tdcore_part2)
set(TD_CORE_PART_TARGETS tdcore_part1 tdcore_part2)
else()
add_library(tdcore STATIC ${TDLIB_SOURCE}) add_library(tdcore STATIC ${TDLIB_SOURCE})
target_include_directories(tdcore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>) target_include_directories(tdcore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
target_link_libraries(tdcore PUBLIC tdapi tdnet tddb tdactor tdutils PRIVATE tdmtproto) target_link_libraries(tdcore PUBLIC tdapi tdnet tddb tdactor tdutils PRIVATE tdmtproto)
set(TD_CORE_PART_TARGETS)
endif()
if (NOT CMAKE_CROSSCOMPILING) if (NOT CMAKE_CROSSCOMPILING)
add_dependencies(tdcore tl_generate_common) add_dependencies(tdcore tl_generate_common)
if (TD_ENABLE_JNI) if (TD_ENABLE_JNI)
@ -1221,7 +1244,7 @@ add_library(Td::TdJson ALIAS TdJson)
add_library(Td::TdJsonStatic ALIAS TdJsonStatic) add_library(Td::TdJsonStatic ALIAS TdJsonStatic)
set(INSTALL_TARGETS tdjson TdJson) set(INSTALL_TARGETS tdjson TdJson)
set(INSTALL_STATIC_TARGETS tdjson_static TdJsonStatic tdjson_private tdcore tdmtproto) set(INSTALL_STATIC_TARGETS tdjson_static TdJsonStatic tdjson_private "${TD_CORE_PART_TARGETS}" tdcore tdmtproto)
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
set(INSTALL_TARGETS ${INSTALL_TARGETS} tdclient TdStatic tdapi) set(INSTALL_TARGETS ${INSTALL_TARGETS} tdclient TdStatic tdapi)
else() else()