diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-03 15:57:20 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-03 15:57:20 +0300 |
| commit | 08b8b87e2b37f0d44b8737e18de8cb2b04037d70 (patch) | |
| tree | e826d2faa759a1ead427d5e04c94d8be7a0ff10c /build | |
| parent | df3958efa5ab2ab36ccc89bb8ddad77970c23beb (diff) | |
| download | ydb-08b8b87e2b37f0d44b8737e18de8cb2b04037d70.tar.gz | |
intermediate changes
ref:219bc6cb00679bf7219c7a9eb813ac45d3cbd5d7
Diffstat (limited to 'build')
| -rw-r--r-- | build/ymake.core.conf | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/build/ymake.core.conf b/build/ymake.core.conf index f515d457a3..0da2746399 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -2485,11 +2485,14 @@ module LIBRARY: _LIBRARY { } when ($CMAKE_PACKAGE != "") { CMAKE_FIND_PKG=find_package $CMAKE_PACKAGE $CMAKE_FIND_PKG_COMP - CPP_LIBRARY_SEM=$CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET $CONAN_REQUIRE && ignored + CPP_LIBRARY_SEM=$CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET $CONAN_REQUIRE $CONAN_OPTS_SEM && ignored } when ($CONAN_REFERENCE != "") { CONAN_REQUIRE=&& conan_require $CONAN_REFERENCE - CPP_LIBRARY_SEM=$CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET $CONAN_REQUIRE && ignored + CPP_LIBRARY_SEM=$CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET $CONAN_REQUIRE $CONAN_OPTS_SEM && ignored + } + when ($CONAN_PKG_OPTS != "") { + CONAN_OPTS_SEM=&& conan_options $CONAN_PKG_OPTS } when ($OPENSOURCE_EXPORT == "no") { CPP_LIBRARY_SEM=ignored @@ -4320,7 +4323,8 @@ when ($USE_SYSTEM_JDK) { } otherwise { when ($JDK_REAL_VERSION == "17") { - JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17 + # need jdk11 for spare parts in "host" platform + JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17 build/platform/java/jdk/jdk11 } when ($JDK_REAL_VERSION == "16") { JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk16 build/platform/java/jdk/jdk17 @@ -9386,15 +9390,17 @@ CMAKE_PACKAGE= CMAKE_PACKAGE_COMPONENT= CMAKE_PACKAGE_TARGET= CONAN_REFERENCE= +CONAN_PKG_OPTS= ### @usage: OPENSOURCE_EXPORT_REPLACEMENT(CMAKE PkgName CMAKE_TARGET PkgName::PkgTarget CONAN ConanRef CMAKE_COMPONENT OptCmakePkgComponent) ### ### Use specified conan/system pacakcge when exporting cmake build scripts for arcadia C++ project ### for opensource publication. -macro OPENSOURCE_EXPORT_REPLACEMENT(CMAKE[], CMAKE_TARGET[], CMAKE_COMPONENET[], CONAN[]) { +macro OPENSOURCE_EXPORT_REPLACEMENT(CMAKE[], CMAKE_TARGET[], CMAKE_COMPONENET[], CONAN[], CONAN_OPTIONS[]) { SET(CMAKE_PACKAGE $CMAKE) SET(CMAKE_PACKAGE_COMPONENT $CMAKE_COMPONENET) SET(CMAKE_LINK_TARGET $CMAKE_TARGET) SET(CONAN_REFERENCE $CONAN) + SET(CONAN_PKG_OPTS $CONAN_OPTIONS) } # tag:licence |