diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-18 15:50:55 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-18 15:50:55 +0300 |
| commit | 8014e5b36dc12f9f0a483f684abb0a19dd2cb306 (patch) | |
| tree | b2a8de1e7de58cceb7193ee2e794d53946c487d7 | |
| parent | 9bc8d9cc172750f71ee4218bb3910b01492eca26 (diff) | |
| download | ydb-8014e5b36dc12f9f0a483f684abb0a19dd2cb306.tar.gz | |
intermediate changes
ref:9de8f52d61a4a8bd1712c9d14cb7ef7ee3c3be4b
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | contrib/libs/libidn/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | contrib/libs/libidn/ya.make | 10 | ||||
| -rw-r--r-- | library/cpp/unicode/punycode/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | library/cpp/uri/CMakeLists.txt | 4 |
5 files changed, 17 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b99930af474..26aaa45130d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,7 @@ conan_cmake_configure( bison/3.5.3 c-ares/1.17.2 libiconv/1.15 + libidn/1.36 openssl/1.1.1l ragel/6.10 yasm/1.3.0 @@ -275,7 +276,6 @@ add_subdirectory(library/cpp/string_utils/scan) add_subdirectory(library/cpp/digest/lower_case) add_subdirectory(library/cpp/mime/types) add_subdirectory(library/cpp/uri) -add_subdirectory(contrib/libs/libidn) add_subdirectory(library/cpp/http/server) add_subdirectory(library/cpp/http/io) add_subdirectory(library/cpp/streams/brotli) diff --git a/contrib/libs/libidn/CMakeLists.txt b/contrib/libs/libidn/CMakeLists.txt deleted file mode 100644 index 3ad18fb6f14..00000000000 --- a/contrib/libs/libidn/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_library(contrib-libs-libidn INTERFACE) diff --git a/contrib/libs/libidn/ya.make b/contrib/libs/libidn/ya.make index 678a813caa7..84fcd55c6c2 100644 --- a/contrib/libs/libidn/ya.make +++ b/contrib/libs/libidn/ya.make @@ -17,6 +17,14 @@ NO_RUNTIME() NO_COMPILER_WARNINGS() +OPENSOURCE_EXPORT_REPLACEMENT( + CMAKE libidn + CMAKE_TARGET libidn::libidn + CONAN libidn/1.36 +) + +IF (NOT EXPORT_CMAKE) + IF (USE_DYNAMIC_IDN) PEERDIR( contrib/libs/libidn/dynamic @@ -27,6 +35,8 @@ ELSE() ) ENDIF() +ENDIF() + END() RECURSE( diff --git a/library/cpp/unicode/punycode/CMakeLists.txt b/library/cpp/unicode/punycode/CMakeLists.txt index d49061a465d..9766efd5d13 100644 --- a/library/cpp/unicode/punycode/CMakeLists.txt +++ b/library/cpp/unicode/punycode/CMakeLists.txt @@ -1,8 +1,10 @@ +find_package(libidn) + add_library(cpp-unicode-punycode) target_link_libraries(cpp-unicode-punycode PUBLIC contrib-libs-cxxsupp yutil - contrib-libs-libidn + libidn::libidn ) target_sources(cpp-unicode-punycode PRIVATE ${CMAKE_SOURCE_DIR}/library/cpp/unicode/punycode/punycode.cpp diff --git a/library/cpp/uri/CMakeLists.txt b/library/cpp/uri/CMakeLists.txt index e4aa518b606..332a12e9434 100644 --- a/library/cpp/uri/CMakeLists.txt +++ b/library/cpp/uri/CMakeLists.txt @@ -1,8 +1,10 @@ +find_package(libidn) + add_library(library-cpp-uri) target_link_libraries(library-cpp-uri PUBLIC contrib-libs-cxxsupp yutil - contrib-libs-libidn + libidn::libidn library-cpp-charset ) target_sources(library-cpp-uri PRIVATE |