diff options
| author | robot-ya-builder <robot-ya-builder@yandex-team.com> | 2022-12-19 05:54:59 +0300 |
|---|---|---|
| committer | robot-ya-builder <robot-ya-builder@yandex-team.com> | 2022-12-19 05:54:59 +0300 |
| commit | 4df48741a94679a2925fb787e50e7152edc4bb7d (patch) | |
| tree | af4c7c7e1306ba78235de9bfa1578f4f4fe6527d | |
| parent | 2c1ec10754b67a23ca1d6309971683a5d5802d16 (diff) | |
| download | ydb-4df48741a94679a2925fb787e50e7152edc4bb7d.tar.gz | |
External build system generator release 7
Update tools: yexport
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/common.cmake (renamed from cmake/yandex_common.cmake) | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 59b3db065a..c7c7d91ae2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,11 +23,11 @@ enable_testing() include(cmake/antlr.cmake) include(cmake/archive.cmake) include(cmake/bison.cmake) +include(cmake/common.cmake) include(cmake/conan.cmake) include(cmake/global_flags.cmake) include(cmake/llvm-tools.cmake) include(cmake/protobuf.cmake) -include(cmake/yandex_common.cmake) include(cmake/global_vars.cmake) if (CMAKE_CROSSCOMPILING) diff --git a/cmake/yandex_common.cmake b/cmake/common.cmake index 1c136d5804..aedd887a20 100644 --- a/cmake/yandex_common.cmake +++ b/cmake/common.cmake @@ -1,6 +1,5 @@ # Set of common macros -find_package(Python2 REQUIRED) find_package(Python3 REQUIRED) add_compile_definitions(CATBOOST_OPENSOURCE=yes) @@ -39,7 +38,7 @@ function(target_joined_source TgtName Out) endforeach() add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${Out} - COMMAND Python2::Interpreter ${CMAKE_SOURCE_DIR}/build/scripts/gen_join_srcs.py ${CMAKE_CURRENT_BINARY_DIR}/${Out} ${IncludesList} + COMMAND Python3::Interpreter ${CMAKE_SOURCE_DIR}/build/scripts/gen_join_srcs.py ${CMAKE_CURRENT_BINARY_DIR}/${Out} ${IncludesList} DEPENDS ${CMAKE_SOURCE_DIR}/build/scripts/gen_join_srcs.py ${ARGN} ) target_sources(${TgtName} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/${Out}) @@ -137,7 +136,7 @@ endfunction() function(vcs_info Tgt) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/__vcs_version__.c - COMMAND Python2::Interpreter ${CMAKE_SOURCE_DIR}/build/scripts/vcs_info.py no-vcs dummy.json ${CMAKE_CURRENT_BINARY_DIR}/__vcs_version__.c ${CMAKE_SOURCE_DIR}/build/scripts/c_templates/svn_interface.c + COMMAND Python3::Interpreter ${CMAKE_SOURCE_DIR}/build/scripts/vcs_info.py no-vcs dummy.json ${CMAKE_CURRENT_BINARY_DIR}/__vcs_version__.c ${CMAKE_SOURCE_DIR}/build/scripts/c_templates/svn_interface.c DEPENDS ${CMAKE_SOURCE_DIR}/build/scripts/vcs_info.py ${CMAKE_SOURCE_DIR}/build/scripts/c_templates/svn_interface.c ) target_sources(${Tgt} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/__vcs_version__.c) |