From 68c9a14e8d4771d73b2e5d156af69556d6e834e1 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sat, 26 Dec 2020 17:30:31 +0100 Subject: [PATCH] Update CMakeLists.txt --- td/generate/CMakeLists.txt | 45 +++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/td/generate/CMakeLists.txt b/td/generate/CMakeLists.txt index 0bf8f0c0c..3ad1443a3 100644 --- a/td/generate/CMakeLists.txt +++ b/td/generate/CMakeLists.txt @@ -95,32 +95,27 @@ set(TL_GENERATE_JSON_SOURCE if (NOT CMAKE_CROSSCOMPILING) # Start of .tlo update - if (WIN32 OR CYGWIN) - add_custom_target(build_tl_parser - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tl-parser/contrib/vs/ - COMMAND cmd /C msbuild tl-parser.sln -t:Rebuild -p:Configuration=Release - COMMENT "Build tl-parser" - DEPENDS scheme/mtproto_api.tl scheme/telegram_api.tl scheme/secret_api.tl scheme/td_api.tl - ) - set(TL_PARSER_BIN "${CMAKE_CURRENT_SOURCE_DIR}/tl-parser/contrib/vs/build/x64/Release/tl-parser") - 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 - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tl-parser/build - COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Release ../ - COMMENT "Configure tl-parser" - 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(prepare_tl_parser ALL + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_SOURCE_DIR}/tl-parser/build) + add_custom_target(configure_tl_parser + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tl-parser/build + COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Release ../ + COMMENT "Configure tl-parser" + 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 - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tl-parser/build - COMMAND ${CMAKE_COMMAND} --build . - COMMENT "Build tl-parser" - 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_custom_target(build_tl_parser + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tl-parser/build + COMMAND ${CMAKE_COMMAND} --build . + COMMENT "Build tl-parser" + 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) + + if (WIN32 OR CYGWIN) + set(TL_PARSER_BIN "${CMAKE_CURRENT_SOURCE_DIR}/tl-parser/build/Debug/tl-parser") + else() set(TL_PARSER_BIN ./tl-parser/build/tl-parser) endif()