diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-03 16:27:57 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-03 16:27:57 +0300 |
| commit | cf8e905de16e491aa857863eaa8b1f6f55f76a79 (patch) | |
| tree | 05258bf4f29f41b48ca7420eade6a09053e3bc55 | |
| parent | 056bda1851c3f41dd444822242ba65c5dacb2212 (diff) | |
| download | ydb-cf8e905de16e491aa857863eaa8b1f6f55f76a79.tar.gz | |
intermediate changes
ref:12093bddc7ffd0845aaed7f63dba7d25abe28cb5
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | cmake/yandex_common.cmake | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a5631e507..51419db9ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,6 +141,9 @@ conan_cmake_configure( "bin, ragel* -> ./bin" "bin, ytasm* -> ./bin" "res, * -> ./bin/bison/res" + OPTIONS + libiconv:shared=True + libidn:shared=True ) conan_cmake_autodetect(settings) conan_cmake_install( diff --git a/cmake/yandex_common.cmake b/cmake/yandex_common.cmake index 41248b0e24..7a0a94d2c0 100644 --- a/cmake/yandex_common.cmake +++ b/cmake/yandex_common.cmake @@ -108,7 +108,10 @@ function(resources Tgt Output) if (NOT ${InputsCount} EQUAL ${KeysCount}) message(FATAL_ERROR "Resources inputs count isn't equal to keys count in " ${Tgt}) endif() - foreach(Input Key IN ZIP_LISTS RESOURCE_ARGS_INPUTS RESOURCE_ARGS_KEYS) + math(EXPR ListsMaxIdx "${InputsCount} - 1") + foreach(Idx RANGE ${ListsMaxIdx}) + list(GET RESOURCE_ARGS_INPUTS ${Idx} Input) + list(GET RESOURCE_ARGS_KEYS ${Idx} Key) list(APPEND ResourcesList ${Input}) list(APPEND ResourcesList ${Key}) endforeach() |