diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-16 11:42:00 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-16 11:42:00 +0300 |
| commit | 50c7a8a430049bcf5a1051b53221ba67d9836079 (patch) | |
| tree | 89fc7c0a12697e5c43f42a5f5b6e9f574796cf0e /contrib | |
| parent | 414d86e47571a9a5e9ef80cfc28f2a7facc32623 (diff) | |
| download | ydb-50c7a8a430049bcf5a1051b53221ba67d9836079.tar.gz | |
intermediate changes
ref:c3402b3ceb4aaa6583e15c4d0c4e8411d0051573
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/libs/c-ares/ya.make | 10 | ||||
| -rw-r--r-- | contrib/libs/openssl/crypto/ya.make | 11 | ||||
| -rw-r--r-- | contrib/libs/openssl/ya.make | 12 |
3 files changed, 31 insertions, 2 deletions
diff --git a/contrib/libs/c-ares/ya.make b/contrib/libs/c-ares/ya.make index bd35762e44..899a5a55d1 100644 --- a/contrib/libs/c-ares/ya.make +++ b/contrib/libs/c-ares/ya.make @@ -11,6 +11,12 @@ VERSION(1.16.1) ORIGINAL_SOURCE(https://c-ares.haxx.se/download/c-ares-1.16.1.tar.gz) +OPENSOURCE_EXPORT_REPLACEMENT( + CMAKE c-ares + CMAKE_TARGET c-ares::c-ares + CONAN c-ares/1.16.1 +) + LICENSE( BSD-3-Clause AND ISC AND @@ -108,7 +114,9 @@ SRCS( windows_port.c ) -CHECK_CONFIG_H(ares_setup.h) +IF (NOT EXPORT_CMAKE) + CHECK_CONFIG_H(ares_setup.h) +ENDIF() END() diff --git a/contrib/libs/openssl/crypto/ya.make b/contrib/libs/openssl/crypto/ya.make index 3acfb0cac7..44d574c830 100644 --- a/contrib/libs/openssl/crypto/ya.make +++ b/contrib/libs/openssl/crypto/ya.make @@ -13,6 +13,13 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) +OPENSOURCE_EXPORT_REPLACEMENT( + CMAKE OpenSSL + CMAKE_PACKAGE_COMPONENT Crypto + CMAKE_TARGET OpenSSL::Crypto + CONAN openssl/1.1.1l +) + OWNER( somov g:cpp-contrib @@ -31,6 +38,8 @@ ADDINCL( contrib/libs/openssl/include ) +IF (NOT EXPORT_CMAKE) + IF (OS_LINUX) IF (ARCH_ARM64) SET(LINUX_ARM64 yes) @@ -1453,4 +1462,6 @@ IF (OS_ANDROID AND ARCH_ARM64) ) ENDIF() +ENDIF() + END() diff --git a/contrib/libs/openssl/ya.make b/contrib/libs/openssl/ya.make index 060d069785..95485364ed 100644 --- a/contrib/libs/openssl/ya.make +++ b/contrib/libs/openssl/ya.make @@ -12,6 +12,12 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) +OPENSOURCE_EXPORT_REPLACEMENT( + CMAKE OpenSSL + CMAKE_TARGET OpenSSL::OpenSSL + CONAN openssl/1.1.1l +) + OWNER( somov g:cpp-contrib @@ -22,12 +28,14 @@ VERSION(1.1.1l) PEERDIR( contrib/libs/openssl/crypto ) - + ADDINCL( GLOBAL contrib/libs/openssl/include contrib/libs/openssl ) +IF (NOT EXPORT_CMAKE) + IF (OS_LINUX) IF (ARCH_ARM64) SET(LINUX_ARM64 yes) @@ -357,6 +365,8 @@ IF (ARCADIA_OPENSSL_DISABLE_ARMV7_TICK) ) ENDIF() +ENDIF() + END() IF (NOT DLL_FOR AND NOT OS_IOS) |