diff options
| author | svidyuk <svidyuk@yandex-team.com> | 2023-08-30 20:31:54 +0300 |
|---|---|---|
| committer | svidyuk <svidyuk@yandex-team.com> | 2023-08-30 20:50:06 +0300 |
| commit | c76aaf823d18acf064939d806427b39cea1bbe16 (patch) | |
| tree | d85585d1cea05124f3f264965654164b38a0591e /library/cpp/config | |
| parent | e7fbce1e36ca8d9a32abcc07805749d572a83dd3 (diff) | |
| download | ydb-c76aaf823d18acf064939d806427b39cea1bbe16.tar.gz | |
Fix input variable missprint
Diffstat (limited to 'library/cpp/config')
| -rw-r--r-- | library/cpp/config/CMakeLists.darwin-x86_64.txt | 15 | ||||
| -rw-r--r-- | library/cpp/config/CMakeLists.linux-aarch64.txt | 15 | ||||
| -rw-r--r-- | library/cpp/config/CMakeLists.linux-x86_64.txt | 15 | ||||
| -rw-r--r-- | library/cpp/config/CMakeLists.windows-x86_64.txt | 15 |
4 files changed, 52 insertions, 8 deletions
diff --git a/library/cpp/config/CMakeLists.darwin-x86_64.txt b/library/cpp/config/CMakeLists.darwin-x86_64.txt index 180da8d9a7e..23c772e4fc2 100644 --- a/library/cpp/config/CMakeLists.darwin-x86_64.txt +++ b/library/cpp/config/CMakeLists.darwin-x86_64.txt @@ -6,6 +6,12 @@ # original buildsystem will not be accepted. +get_built_tool_path( + TOOL_archiver_bin + TOOL_archiver_dependency + tools/archiver + archiver +) add_library(library-cpp-config) target_include_directories(library-cpp-config PUBLIC @@ -32,10 +38,10 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/library/cpp/config/code.inc DEPENDS - ${CMAKE_BINARY_DIR}/tools/archiver/archiver + ${TOOL_archiver_bin} ${CMAKE_SOURCE_DIR}/library/cpp/config/support/pp.lua COMMAND - ${CMAKE_BINARY_DIR}/tools/archiver/archiver + ${TOOL_archiver_bin} -q -x ${CMAKE_SOURCE_DIR}/library/cpp/config/support/pp.lua: @@ -47,3 +53,8 @@ target_ragel_lexers(library-cpp-config ${CMAKE_SOURCE_DIR}/library/cpp/config/markupfsm.h.rl6 -CG2 ) +if(NOT CMAKE_CROSSCOMPILING) + add_dependencies(library-cpp-config + archiver +) +endif() diff --git a/library/cpp/config/CMakeLists.linux-aarch64.txt b/library/cpp/config/CMakeLists.linux-aarch64.txt index 1144f52d82f..3e91ece220b 100644 --- a/library/cpp/config/CMakeLists.linux-aarch64.txt +++ b/library/cpp/config/CMakeLists.linux-aarch64.txt @@ -6,6 +6,12 @@ # original buildsystem will not be accepted. +get_built_tool_path( + TOOL_archiver_bin + TOOL_archiver_dependency + tools/archiver + archiver +) add_library(library-cpp-config) target_include_directories(library-cpp-config PUBLIC @@ -33,10 +39,10 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/library/cpp/config/code.inc DEPENDS - ${CMAKE_BINARY_DIR}/tools/archiver/archiver + ${TOOL_archiver_bin} ${CMAKE_SOURCE_DIR}/library/cpp/config/support/pp.lua COMMAND - ${CMAKE_BINARY_DIR}/tools/archiver/archiver + ${TOOL_archiver_bin} -q -x ${CMAKE_SOURCE_DIR}/library/cpp/config/support/pp.lua: @@ -48,3 +54,8 @@ target_ragel_lexers(library-cpp-config ${CMAKE_SOURCE_DIR}/library/cpp/config/markupfsm.h.rl6 -CG2 ) +if(NOT CMAKE_CROSSCOMPILING) + add_dependencies(library-cpp-config + archiver +) +endif() diff --git a/library/cpp/config/CMakeLists.linux-x86_64.txt b/library/cpp/config/CMakeLists.linux-x86_64.txt index 1144f52d82f..3e91ece220b 100644 --- a/library/cpp/config/CMakeLists.linux-x86_64.txt +++ b/library/cpp/config/CMakeLists.linux-x86_64.txt @@ -6,6 +6,12 @@ # original buildsystem will not be accepted. +get_built_tool_path( + TOOL_archiver_bin + TOOL_archiver_dependency + tools/archiver + archiver +) add_library(library-cpp-config) target_include_directories(library-cpp-config PUBLIC @@ -33,10 +39,10 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/library/cpp/config/code.inc DEPENDS - ${CMAKE_BINARY_DIR}/tools/archiver/archiver + ${TOOL_archiver_bin} ${CMAKE_SOURCE_DIR}/library/cpp/config/support/pp.lua COMMAND - ${CMAKE_BINARY_DIR}/tools/archiver/archiver + ${TOOL_archiver_bin} -q -x ${CMAKE_SOURCE_DIR}/library/cpp/config/support/pp.lua: @@ -48,3 +54,8 @@ target_ragel_lexers(library-cpp-config ${CMAKE_SOURCE_DIR}/library/cpp/config/markupfsm.h.rl6 -CG2 ) +if(NOT CMAKE_CROSSCOMPILING) + add_dependencies(library-cpp-config + archiver +) +endif() diff --git a/library/cpp/config/CMakeLists.windows-x86_64.txt b/library/cpp/config/CMakeLists.windows-x86_64.txt index 21ae61afdb3..a3573c913a0 100644 --- a/library/cpp/config/CMakeLists.windows-x86_64.txt +++ b/library/cpp/config/CMakeLists.windows-x86_64.txt @@ -6,6 +6,12 @@ # original buildsystem will not be accepted. +get_built_tool_path( + TOOL_archiver_bin + TOOL_archiver_dependency + tools/archiver + archiver +) add_library(library-cpp-config) target_include_directories(library-cpp-config PUBLIC @@ -32,10 +38,10 @@ add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/library/cpp/config/code.inc DEPENDS - ${CMAKE_BINARY_DIR}/tools/archiver/archiver.exe + ${TOOL_archiver_bin} ${CMAKE_SOURCE_DIR}/library/cpp/config/support/pp.lua COMMAND - ${CMAKE_BINARY_DIR}/tools/archiver/archiver.exe + ${TOOL_archiver_bin} -q -x ${CMAKE_SOURCE_DIR}/library/cpp/config/support/pp.lua: @@ -47,3 +53,8 @@ target_ragel_lexers(library-cpp-config ${CMAKE_SOURCE_DIR}/library/cpp/config/markupfsm.h.rl6 -CT0 ) +if(NOT CMAKE_CROSSCOMPILING) + add_dependencies(library-cpp-config + archiver +) +endif() |