Update CMakeLists.txt and tl-parser

This commit is contained in:
Andrea Cavalli 2020-12-24 11:59:41 +01:00
parent 7f00e525eb
commit 898df61d6e
2 changed files with 9 additions and 6 deletions

View File

@ -104,21 +104,24 @@ if (NOT CMAKE_CROSSCOMPILING)
) )
set(TL_PARSER_BIN "${CMAKE_CURRENT_SOURCE_DIR}/tl-parser/contrib/vs/build/x64/Release/tl-parser") set(TL_PARSER_BIN "${CMAKE_CURRENT_SOURCE_DIR}/tl-parser/contrib/vs/build/x64/Release/tl-parser")
else() else()
add_custom_target(prepare_tl_parser ALL
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_SOURCE_DIR}/tl-parser/build)
add_custom_target(configure_tl_parser add_custom_target(configure_tl_parser
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tl-parser WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tl-parser/build
COMMAND sh ./configure COMMAND cmake -DCMAKE_BUILD_TYPE=Release ../
COMMENT "Configure tl-parser" COMMENT "Configure tl-parser"
DEPENDS scheme/mtproto_api.tl scheme/telegram_api.tl scheme/secret_api.tl scheme/td_api.tl DEPENDS scheme/mtproto_api.tl scheme/telegram_api.tl scheme/secret_api.tl scheme/td_api.tl
) )
add_dependencies(configure_tl_parser prepare_tl_parser)
add_custom_target(build_tl_parser add_custom_target(build_tl_parser
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tl-parser WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tl-parser/build
COMMAND make COMMAND ${CMAKE_COMMAND} --build .
COMMENT "Build tl-parser" COMMENT "Build tl-parser"
DEPENDS scheme/mtproto_api.tl scheme/telegram_api.tl scheme/secret_api.tl scheme/td_api.tl DEPENDS scheme/mtproto_api.tl scheme/telegram_api.tl scheme/secret_api.tl scheme/td_api.tl
) )
add_dependencies(build_tl_parser configure_tl_parser) add_dependencies(build_tl_parser configure_tl_parser)
set(TL_PARSER_BIN ./tl-parser/bin/tl-parser) set(TL_PARSER_BIN ./tl-parser/build/tl-parser)
endif() endif()
add_custom_target(generate_mtproto_api_tlo add_custom_target(generate_mtproto_api_tlo

@ -1 +1 @@
Subproject commit 16b5b97f4492a8050868cb0e93796a7edc119b65 Subproject commit c089daaa413f10de247efbc4a076908ae933c91c