fix darwin build

2 files changed, 42 insertions, 53 deletions

diff --git a/contrib/libs/poco/Crypto/CMakeLists.linux.txt b/contrib/libs/poco/Crypto/CMakeLists.linux.txt
deleted file mode 100644
index bfbf882e7e..0000000000
--- a/contrib/libs/poco/Crypto/CMakeLists.linux.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-
-# This file was gererated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-find_package(OpenSSL REQUIRED)
-
-add_library(libs-poco-Crypto)
-target_compile_options(libs-poco-Crypto PRIVATE
-  -Wno-everything
-)
-target_include_directories(libs-poco-Crypto PUBLIC
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/include
-)
-target_include_directories(libs-poco-Crypto PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Foundation/include
-)
-target_link_libraries(libs-poco-Crypto PUBLIC
-  contrib-libs-cxxsupp
-  OpenSSL::OpenSSL
-  libs-poco-Foundation
-)
-target_sources(libs-poco-Crypto PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/Cipher.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/CipherFactory.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/CipherImpl.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/CipherKey.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/CipherKeyImpl.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/CryptoException.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/CryptoStream.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/CryptoTransform.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/DigestEngine.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/ECDSADigestEngine.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/ECKey.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/ECKeyImpl.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/EVPPKey.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/KeyPair.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/KeyPairImpl.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/OpenSSLInitializer.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/PKCS12Container.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/RSACipherImpl.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/RSADigestEngine.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/RSAKey.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/RSAKeyImpl.cpp
-  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/X509Certificate.cpp
-)
diff --git a/contrib/libs/poco/Crypto/CMakeLists.txt b/contrib/libs/poco/Crypto/CMakeLists.txt
index e8c98bfd99..bfbf882e7e 100644
--- a/contrib/libs/poco/Crypto/CMakeLists.txt
+++ b/contrib/libs/poco/Crypto/CMakeLists.txt
@@ -6,6 +6,45 @@
 # original buildsystem will not be accepted.
 
 
-if (UNIX AND NOT APPLE)
-  include(CMakeLists.linux.txt)
-endif()
+find_package(OpenSSL REQUIRED)
+
+add_library(libs-poco-Crypto)
+target_compile_options(libs-poco-Crypto PRIVATE
+  -Wno-everything
+)
+target_include_directories(libs-poco-Crypto PUBLIC
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/include
+)
+target_include_directories(libs-poco-Crypto PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Foundation/include
+)
+target_link_libraries(libs-poco-Crypto PUBLIC
+  contrib-libs-cxxsupp
+  OpenSSL::OpenSSL
+  libs-poco-Foundation
+)
+target_sources(libs-poco-Crypto PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/Cipher.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/CipherFactory.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/CipherImpl.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/CipherKey.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/CipherKeyImpl.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/CryptoException.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/CryptoStream.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/CryptoTransform.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/DigestEngine.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/ECDSADigestEngine.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/ECKey.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/ECKeyImpl.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/EVPPKey.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/KeyPair.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/KeyPairImpl.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/OpenSSLInitializer.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/PKCS12Container.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/RSACipherImpl.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/RSADigestEngine.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/RSAKey.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/RSAKeyImpl.cpp
+  ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/src/X509Certificate.cpp
+)