diff options
| author | robot-piglet <robot-piglet@yandex-team.com> | 2024-09-11 06:43:18 +0300 |
|---|---|---|
| committer | robot-piglet <robot-piglet@yandex-team.com> | 2024-09-11 06:53:42 +0300 |
| commit | ab30199e7cce2f383741c0e20fd69e3fe1c6e529 (patch) | |
| tree | 4eac37be8e777a4e0c8ca1b11af7ec25bc8d0348 /contrib | |
| parent | d6722c76399d9b6813119aed315a69529f8d2193 (diff) | |
| download | ydb-ab30199e7cce2f383741c0e20fd69e3fe1c6e529.tar.gz | |
Intermediate changes
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/libs/libaio/ya.make | 8 | ||||
| -rw-r--r-- | contrib/libs/libidn/ya.make | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/contrib/libs/libaio/ya.make b/contrib/libs/libaio/ya.make index 37000691cd..2c8fbcbf8e 100644 --- a/contrib/libs/libaio/ya.make +++ b/contrib/libs/libaio/ya.make @@ -19,11 +19,13 @@ IF (EXPORT_CMAKE) CMAKE_TARGET AIO::aio ) -ELSEIF (USE_AIO == "dynamic") +ENDIF() + +IF (USE_AIO == "dynamic" AND NOT EXPORT_CMAKE) PEERDIR( contrib/libs/libaio/dynamic ) -ELSEIF (USE_AIO == "local") +ELSEIF (USE_AIO == "local" OR EXPORT_CMAKE) GLOBAL_CFLAGS(${USE_LOCAL_AIO_CFLAGS}) DEFAULT(USE_LOCAL_AIO_LDFLAGS -laio) LDFLAGS(${USE_LOCAL_AIO_LDFLAGS}) @@ -35,7 +37,7 @@ ENDIF() END() -IF (USE_AIO != "local") +IF (USE_AIO != "local" AND NOT EXPORT_CMAKE) RECURSE( dynamic static diff --git a/contrib/libs/libidn/ya.make b/contrib/libs/libidn/ya.make index fc1d35bcc5..ef3f85cbde 100644 --- a/contrib/libs/libidn/ya.make +++ b/contrib/libs/libidn/ya.make @@ -21,11 +21,13 @@ IF (EXPORT_CMAKE) CMAKE_TARGET IDN::IDN ) -ELSEIF (USE_IDN == "dynamic") +ENDIF() + +IF (USE_IDN == "dynamic" AND NOT EXPORT_CMAKE) PEERDIR( contrib/libs/libidn/dynamic ) -ELSEIF (USE_IDN == "local") +ELSEIF (USE_IDN == "local" OR EXPORT_CMAKE) GLOBAL_CFLAGS(${USE_LOCAL_IDN_CFLAGS}) DEFAULT(USE_LOCAL_IDN_LDFLAGS -lidn) LDFLAGS(${USE_LOCAL_IDN_LDFLAGS}) @@ -37,7 +39,7 @@ ENDIF() END() -IF (USE_IDN != "local") +IF (USE_IDN != "local" AND NOT EXPORT_CMAKE) RECURSE( dynamic static |