diff options
| author | dimdim11 <dimdim11@yandex-team.com> | 2024-09-10 17:10:39 +0300 |
|---|---|---|
| committer | dimdim11 <dimdim11@yandex-team.com> | 2024-09-10 17:24:13 +0300 |
| commit | 68a70934be2fb1d76f07a8776b7e58bd2ae127fa (patch) | |
| tree | e700184c362c275d54520a8d3102b1cb8dad490e | |
| parent | bb81bb34de7bced2f6a98f33281fb5bcc1d6adf2 (diff) | |
| download | ydb-68a70934be2fb1d76f07a8776b7e58bd2ae127fa.tar.gz | |
Fix export IDN and AIO
Fix export IDN and AIO
b136f876eac2579a7b34019ebbf179f988d2a8b2
6 files changed, 44 insertions, 8 deletions
diff --git a/build/export_generators/cmake/cmake/FindAIO.cmake b/build/export_generators/cmake/cmake/FindAIO.cmake index a9d7d87b55..8b774e3c7c 100644 --- a/build/export_generators/cmake/cmake/FindAIO.cmake +++ b/build/export_generators/cmake/cmake/FindAIO.cmake @@ -6,11 +6,11 @@ find_path(AIO_INCLUDE_DIR libaio.h - HINTS $ENV{AIO_ROOT}/include) + HINTS $ENV{AIO_ROOT}/include /usr/include REQUIRED) find_library(AIO_LIBRARIES aio - HINTS $ENV{AIO_ROOT}/lib) + HINTS $ENV{AIO_ROOT}/lib REQUIRED) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(AIO DEFAULT_MSG AIO_LIBRARIES AIO_INCLUDE_DIR) diff --git a/build/export_generators/cmake/cmake/FindIDN.cmake b/build/export_generators/cmake/cmake/FindIDN.cmake index 7342fb6d7a..a7f3913aac 100644 --- a/build/export_generators/cmake/cmake/FindIDN.cmake +++ b/build/export_generators/cmake/cmake/FindIDN.cmake @@ -6,11 +6,11 @@ find_path(IDN_INCLUDE_DIR idna.h - HINTS $ENV{IDN_ROOT}/include) + HINTS $ENV{IDN_ROOT}/include /usr/include REQUIRED) find_library(IDN_LIBRARIES idn - HINTS $ENV{IDN_ROOT}/lib) + HINTS $ENV{IDN_ROOT}/lib REQUIRED) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(IDN DEFAULT_MSG IDN_LIBRARIES IDN_INCLUDE_DIR) diff --git a/build/export_generators/cmake/generator.toml b/build/export_generators/cmake/generator.toml index 7349f89703..d253630ab6 100644 --- a/build/export_generators/cmake/generator.toml +++ b/build/export_generators/cmake/generator.toml @@ -399,6 +399,24 @@ copy=[ ] add_values=[{attr="includes", values=["cmake/swig.cmake"]}] +[[rules]] +attrs=[ + "packages-name=IDN", +] +copy=[ + "cmake/FindIDN.cmake", +] +add_values=[{attr="includes", values=["cmake/FindIDN.cmake"]}] + +[[rules]] +attrs=[ + "packages-name=AIO", +] +copy=[ + "cmake/FindAIO.cmake", +] +add_values=[{attr="includes", values=["cmake/FindAIO.cmake"]}] + # Conan profiles for platforms [[rules]] platforms=[ diff --git a/build/export_generators/hardcoded-cmake/cmake/FindAIO.cmake b/build/export_generators/hardcoded-cmake/cmake/FindAIO.cmake index a9d7d87b55..8b774e3c7c 100644 --- a/build/export_generators/hardcoded-cmake/cmake/FindAIO.cmake +++ b/build/export_generators/hardcoded-cmake/cmake/FindAIO.cmake @@ -6,11 +6,11 @@ find_path(AIO_INCLUDE_DIR libaio.h - HINTS $ENV{AIO_ROOT}/include) + HINTS $ENV{AIO_ROOT}/include /usr/include REQUIRED) find_library(AIO_LIBRARIES aio - HINTS $ENV{AIO_ROOT}/lib) + HINTS $ENV{AIO_ROOT}/lib REQUIRED) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(AIO DEFAULT_MSG AIO_LIBRARIES AIO_INCLUDE_DIR) diff --git a/build/export_generators/hardcoded-cmake/cmake/FindIDN.cmake b/build/export_generators/hardcoded-cmake/cmake/FindIDN.cmake index 7342fb6d7a..a7f3913aac 100644 --- a/build/export_generators/hardcoded-cmake/cmake/FindIDN.cmake +++ b/build/export_generators/hardcoded-cmake/cmake/FindIDN.cmake @@ -6,11 +6,11 @@ find_path(IDN_INCLUDE_DIR idna.h - HINTS $ENV{IDN_ROOT}/include) + HINTS $ENV{IDN_ROOT}/include /usr/include REQUIRED) find_library(IDN_LIBRARIES idn - HINTS $ENV{IDN_ROOT}/lib) + HINTS $ENV{IDN_ROOT}/lib REQUIRED) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(IDN DEFAULT_MSG IDN_LIBRARIES IDN_INCLUDE_DIR) diff --git a/build/export_generators/hardcoded-cmake/generator.toml b/build/export_generators/hardcoded-cmake/generator.toml index 503d210e87..3e36586f39 100644 --- a/build/export_generators/hardcoded-cmake/generator.toml +++ b/build/export_generators/hardcoded-cmake/generator.toml @@ -211,6 +211,24 @@ copy=[ ] add_values=[{attr="includes", values=["cmake/swig.cmake"]}] +[[rules]] +attrs=[ + "find_package=IDN", +] +copy=[ + "cmake/FindIDN.cmake", +] +add_values=[{attr="includes", values=["cmake/FindIDN.cmake"]}] + +[[rules]] +attrs=[ + "find_package=AIO", +] +copy=[ + "cmake/FindAIO.cmake", +] +add_values=[{attr="includes", values=["cmake/FindAIO.cmake"]}] + # Conan profiles for platforms [[rules]] platforms=[ |