aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-22 15:22:21 +0300
committerarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-22 15:22:21 +0300
commitcb69ebfc910722a9ecfc2234d781f79e4a60fb60 (patch)
tree40adcfcf9bb46885103a78a1a85839293b8766f8 /build
parent7d32d59535c3c2cafd4f033fdabfd43b99049a24 (diff)
downloadydb-cb69ebfc910722a9ecfc2234d781f79e4a60fb60.tar.gz
intermediate changes
ref:b4effc9582e42dfa79e9a44a91df283419947b3a
Diffstat (limited to 'build')
-rw-r--r--build/ymake.core.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 65eee623d6..0d8bbd32e8 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -2460,10 +2460,10 @@ module LIBRARY: _LIBRARY {
}
when ($CMAKE_PACKAGE != "") {
CMAKE_FIND_PKG=find_package $CMAKE_PACKAGE $CMAKE_FIND_PKG_COMP
- CPP_LIBRARY_SEM=$CONAN_REQUIRE && $CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET && ignored
+ CPP_LIBRARY_SEM=$CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET $CONAN_REQUIRE && ignored
}
when ($CONAN_REFERENCE != "") {
- CONAN_REQUIRE=conan_require $CONAN_REFERENCE
+ CONAN_REQUIRE=&& conan_require $CONAN_REFERENCE
CPP_LIBRARY_SEM=$CONAN_REQUIRE && $CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET && ignored
}
when ($OPENSOURCE_EXPORT == "no") {