Intermediate changes

52 files changed, 60 insertions, 116 deletions

diff --git a/library/cpp/actors/dnscachelib/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/dnscachelib/CMakeLists.darwin-x86_64.txt
index 539f17a1a2..b769b26408 100644
--- a/library/cpp/actors/dnscachelib/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/dnscachelib/CMakeLists.darwin-x86_64.txt
@@ -6,13 +6,12 @@
 # original buildsystem will not be accepted.
 
 
-find_package(c-ares REQUIRED)
 
 add_library(cpp-actors-dnscachelib)
 target_link_libraries(cpp-actors-dnscachelib PUBLIC
   contrib-libs-cxxsupp
   yutil
-  c-ares::c-ares
+  contrib-libs-c-ares
   library-cpp-lwtrace
   cpp-deprecated-atomic
 )
diff --git a/library/cpp/actors/dnscachelib/CMakeLists.linux-aarch64.txt b/library/cpp/actors/dnscachelib/CMakeLists.linux-aarch64.txt
index 03a286a663..60de9ca5ab 100644
--- a/library/cpp/actors/dnscachelib/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/dnscachelib/CMakeLists.linux-aarch64.txt
@@ -6,14 +6,13 @@
 # original buildsystem will not be accepted.
 
 
-find_package(c-ares REQUIRED)
 
 add_library(cpp-actors-dnscachelib)
 target_link_libraries(cpp-actors-dnscachelib PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  c-ares::c-ares
+  contrib-libs-c-ares
   library-cpp-lwtrace
   cpp-deprecated-atomic
 )
diff --git a/library/cpp/actors/dnscachelib/CMakeLists.linux-x86_64.txt b/library/cpp/actors/dnscachelib/CMakeLists.linux-x86_64.txt
index 03a286a663..60de9ca5ab 100644
--- a/library/cpp/actors/dnscachelib/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/dnscachelib/CMakeLists.linux-x86_64.txt
@@ -6,14 +6,13 @@
 # original buildsystem will not be accepted.
 
 
-find_package(c-ares REQUIRED)
 
 add_library(cpp-actors-dnscachelib)
 target_link_libraries(cpp-actors-dnscachelib PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  c-ares::c-ares
+  contrib-libs-c-ares
   library-cpp-lwtrace
   cpp-deprecated-atomic
 )
diff --git a/library/cpp/actors/dnscachelib/CMakeLists.windows-x86_64.txt b/library/cpp/actors/dnscachelib/CMakeLists.windows-x86_64.txt
index 539f17a1a2..b769b26408 100644
--- a/library/cpp/actors/dnscachelib/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/dnscachelib/CMakeLists.windows-x86_64.txt
@@ -6,13 +6,12 @@
 # original buildsystem will not be accepted.
 
 
-find_package(c-ares REQUIRED)
 
 add_library(cpp-actors-dnscachelib)
 target_link_libraries(cpp-actors-dnscachelib PUBLIC
   contrib-libs-cxxsupp
   yutil
-  c-ares::c-ares
+  contrib-libs-c-ares
   library-cpp-lwtrace
   cpp-deprecated-atomic
 )
diff --git a/library/cpp/actors/dnsresolver/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/dnsresolver/CMakeLists.darwin-x86_64.txt
index 8d9cb550f1..30d19f1b99 100644
--- a/library/cpp/actors/dnsresolver/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/dnsresolver/CMakeLists.darwin-x86_64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(c-ares REQUIRED)
 add_subdirectory(ut)
 
 add_library(cpp-actors-dnsresolver)
@@ -14,7 +13,7 @@ target_link_libraries(cpp-actors-dnsresolver PUBLIC
   contrib-libs-cxxsupp
   yutil
   cpp-actors-core
-  c-ares::c-ares
+  contrib-libs-c-ares
 )
 target_sources(cpp-actors-dnsresolver PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver.cpp
diff --git a/library/cpp/actors/dnsresolver/CMakeLists.linux-aarch64.txt b/library/cpp/actors/dnsresolver/CMakeLists.linux-aarch64.txt
index c4741c037e..f7dbdca2ef 100644
--- a/library/cpp/actors/dnsresolver/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/dnsresolver/CMakeLists.linux-aarch64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(c-ares REQUIRED)
 add_subdirectory(ut)
 
 add_library(cpp-actors-dnsresolver)
@@ -15,7 +14,7 @@ target_link_libraries(cpp-actors-dnsresolver PUBLIC
   contrib-libs-cxxsupp
   yutil
   cpp-actors-core
-  c-ares::c-ares
+  contrib-libs-c-ares
 )
 target_sources(cpp-actors-dnsresolver PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver.cpp
diff --git a/library/cpp/actors/dnsresolver/CMakeLists.linux-x86_64.txt b/library/cpp/actors/dnsresolver/CMakeLists.linux-x86_64.txt
index c4741c037e..f7dbdca2ef 100644
--- a/library/cpp/actors/dnsresolver/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/dnsresolver/CMakeLists.linux-x86_64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(c-ares REQUIRED)
 add_subdirectory(ut)
 
 add_library(cpp-actors-dnsresolver)
@@ -15,7 +14,7 @@ target_link_libraries(cpp-actors-dnsresolver PUBLIC
   contrib-libs-cxxsupp
   yutil
   cpp-actors-core
-  c-ares::c-ares
+  contrib-libs-c-ares
 )
 target_sources(cpp-actors-dnsresolver PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver.cpp
diff --git a/library/cpp/actors/dnsresolver/CMakeLists.windows-x86_64.txt b/library/cpp/actors/dnsresolver/CMakeLists.windows-x86_64.txt
index 8d9cb550f1..30d19f1b99 100644
--- a/library/cpp/actors/dnsresolver/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/dnsresolver/CMakeLists.windows-x86_64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(c-ares REQUIRED)
 add_subdirectory(ut)
 
 add_library(cpp-actors-dnsresolver)
@@ -14,7 +13,7 @@ target_link_libraries(cpp-actors-dnsresolver PUBLIC
   contrib-libs-cxxsupp
   yutil
   cpp-actors-core
-  c-ares::c-ares
+  contrib-libs-c-ares
 )
 target_sources(cpp-actors-dnsresolver PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver.cpp
diff --git a/library/cpp/actors/http/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/http/CMakeLists.darwin-x86_64.txt
index 7dc97fa768..1947b6fa39 100644
--- a/library/cpp/actors/http/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/http/CMakeLists.darwin-x86_64.txt
@@ -6,16 +6,14 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
-find_package(ZLIB REQUIRED)
 add_subdirectory(ut)
 
 add_library(cpp-actors-http)
 target_link_libraries(cpp-actors-http PUBLIC
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
-  ZLIB::ZLIB
+  contrib-libs-openssl
+  contrib-libs-zlib
   cpp-actors-core
   cpp-actors-interconnect
   library-cpp-dns
diff --git a/library/cpp/actors/http/CMakeLists.linux-aarch64.txt b/library/cpp/actors/http/CMakeLists.linux-aarch64.txt
index ea0055be16..a0e186fa07 100644
--- a/library/cpp/actors/http/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/http/CMakeLists.linux-aarch64.txt
@@ -6,8 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
-find_package(ZLIB REQUIRED)
 add_subdirectory(ut)
 
 add_library(cpp-actors-http)
@@ -15,8 +13,8 @@ target_link_libraries(cpp-actors-http PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
-  ZLIB::ZLIB
+  contrib-libs-openssl
+  contrib-libs-zlib
   cpp-actors-core
   cpp-actors-interconnect
   library-cpp-dns
diff --git a/library/cpp/actors/http/CMakeLists.linux-x86_64.txt b/library/cpp/actors/http/CMakeLists.linux-x86_64.txt
index ea0055be16..a0e186fa07 100644
--- a/library/cpp/actors/http/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/http/CMakeLists.linux-x86_64.txt
@@ -6,8 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
-find_package(ZLIB REQUIRED)
 add_subdirectory(ut)
 
 add_library(cpp-actors-http)
@@ -15,8 +13,8 @@ target_link_libraries(cpp-actors-http PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
-  ZLIB::ZLIB
+  contrib-libs-openssl
+  contrib-libs-zlib
   cpp-actors-core
   cpp-actors-interconnect
   library-cpp-dns
diff --git a/library/cpp/actors/http/CMakeLists.windows-x86_64.txt b/library/cpp/actors/http/CMakeLists.windows-x86_64.txt
index 7dc97fa768..1947b6fa39 100644
--- a/library/cpp/actors/http/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/http/CMakeLists.windows-x86_64.txt
@@ -6,16 +6,14 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
-find_package(ZLIB REQUIRED)
 add_subdirectory(ut)
 
 add_library(cpp-actors-http)
 target_link_libraries(cpp-actors-http PUBLIC
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
-  ZLIB::ZLIB
+  contrib-libs-openssl
+  contrib-libs-zlib
   cpp-actors-core
   cpp-actors-interconnect
   library-cpp-dns
diff --git a/library/cpp/actors/interconnect/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/interconnect/CMakeLists.darwin-x86_64.txt
index b0843f7a1f..23f6314220 100644
--- a/library/cpp/actors/interconnect/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/interconnect/CMakeLists.darwin-x86_64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 add_subdirectory(mock)
 add_subdirectory(ut)
 add_subdirectory(ut_fat)
@@ -17,7 +16,7 @@ target_link_libraries(cpp-actors-interconnect PUBLIC
   contrib-libs-cxxsupp
   yutil
   contrib-libs-libc_compat
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
   contrib-libs-xxhash
   cpp-actors-core
   cpp-actors-dnscachelib
diff --git a/library/cpp/actors/interconnect/CMakeLists.linux-aarch64.txt b/library/cpp/actors/interconnect/CMakeLists.linux-aarch64.txt
index 88d247f735..f6fc21f857 100644
--- a/library/cpp/actors/interconnect/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/interconnect/CMakeLists.linux-aarch64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 add_subdirectory(mock)
 add_subdirectory(ut)
 add_subdirectory(ut_fat)
@@ -18,7 +17,7 @@ target_link_libraries(cpp-actors-interconnect PUBLIC
   contrib-libs-cxxsupp
   yutil
   contrib-libs-libc_compat
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
   contrib-libs-xxhash
   cpp-actors-core
   cpp-actors-dnscachelib
diff --git a/library/cpp/actors/interconnect/CMakeLists.linux-x86_64.txt b/library/cpp/actors/interconnect/CMakeLists.linux-x86_64.txt
index 88d247f735..f6fc21f857 100644
--- a/library/cpp/actors/interconnect/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/interconnect/CMakeLists.linux-x86_64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 add_subdirectory(mock)
 add_subdirectory(ut)
 add_subdirectory(ut_fat)
@@ -18,7 +17,7 @@ target_link_libraries(cpp-actors-interconnect PUBLIC
   contrib-libs-cxxsupp
   yutil
   contrib-libs-libc_compat
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
   contrib-libs-xxhash
   cpp-actors-core
   cpp-actors-dnscachelib
diff --git a/library/cpp/actors/interconnect/CMakeLists.windows-x86_64.txt b/library/cpp/actors/interconnect/CMakeLists.windows-x86_64.txt
index b0843f7a1f..23f6314220 100644
--- a/library/cpp/actors/interconnect/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/interconnect/CMakeLists.windows-x86_64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 add_subdirectory(mock)
 add_subdirectory(ut)
 add_subdirectory(ut_fat)
@@ -17,7 +16,7 @@ target_link_libraries(cpp-actors-interconnect PUBLIC
   contrib-libs-cxxsupp
   yutil
   contrib-libs-libc_compat
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
   contrib-libs-xxhash
   cpp-actors-core
   cpp-actors-dnscachelib
diff --git a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.darwin-x86_64.txt b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.darwin-x86_64.txt
index 2e13dbce8c..41f29397bc 100644
--- a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.darwin-x86_64.txt
@@ -6,13 +6,12 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 
 add_library(blockcodecs-codecs-zlib INTERFACE)
 target_link_libraries(blockcodecs-codecs-zlib INTERFACE
   contrib-libs-cxxsupp
   yutil
-  ZLIB::ZLIB
+  contrib-libs-zlib
   cpp-blockcodecs-core
 )
 
@@ -20,7 +19,7 @@ add_global_library_for(blockcodecs-codecs-zlib.global blockcodecs-codecs-zlib)
 target_link_libraries(blockcodecs-codecs-zlib.global PUBLIC
   contrib-libs-cxxsupp
   yutil
-  ZLIB::ZLIB
+  contrib-libs-zlib
   cpp-blockcodecs-core
 )
 target_sources(blockcodecs-codecs-zlib.global PRIVATE
diff --git a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.linux-aarch64.txt b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.linux-aarch64.txt
index 22fe89535f..5d91c9e50b 100644
--- a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.linux-aarch64.txt
@@ -6,14 +6,13 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 
 add_library(blockcodecs-codecs-zlib INTERFACE)
 target_link_libraries(blockcodecs-codecs-zlib INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  ZLIB::ZLIB
+  contrib-libs-zlib
   cpp-blockcodecs-core
 )
 
@@ -22,7 +21,7 @@ target_link_libraries(blockcodecs-codecs-zlib.global PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  ZLIB::ZLIB
+  contrib-libs-zlib
   cpp-blockcodecs-core
 )
 target_sources(blockcodecs-codecs-zlib.global PRIVATE
diff --git a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.linux-x86_64.txt b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.linux-x86_64.txt
index 22fe89535f..5d91c9e50b 100644
--- a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.linux-x86_64.txt
@@ -6,14 +6,13 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 
 add_library(blockcodecs-codecs-zlib INTERFACE)
 target_link_libraries(blockcodecs-codecs-zlib INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  ZLIB::ZLIB
+  contrib-libs-zlib
   cpp-blockcodecs-core
 )
 
@@ -22,7 +21,7 @@ target_link_libraries(blockcodecs-codecs-zlib.global PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  ZLIB::ZLIB
+  contrib-libs-zlib
   cpp-blockcodecs-core
 )
 target_sources(blockcodecs-codecs-zlib.global PRIVATE
diff --git a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.windows-x86_64.txt b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.windows-x86_64.txt
index 2e13dbce8c..41f29397bc 100644
--- a/library/cpp/blockcodecs/codecs/zlib/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/blockcodecs/codecs/zlib/CMakeLists.windows-x86_64.txt
@@ -6,13 +6,12 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 
 add_library(blockcodecs-codecs-zlib INTERFACE)
 target_link_libraries(blockcodecs-codecs-zlib INTERFACE
   contrib-libs-cxxsupp
   yutil
-  ZLIB::ZLIB
+  contrib-libs-zlib
   cpp-blockcodecs-core
 )
 
@@ -20,7 +19,7 @@ add_global_library_for(blockcodecs-codecs-zlib.global blockcodecs-codecs-zlib)
 target_link_libraries(blockcodecs-codecs-zlib.global PUBLIC
   contrib-libs-cxxsupp
   yutil
-  ZLIB::ZLIB
+  contrib-libs-zlib
   cpp-blockcodecs-core
 )
 target_sources(blockcodecs-codecs-zlib.global PRIVATE
diff --git a/library/cpp/http/fetch/CMakeLists.darwin-x86_64.txt b/library/cpp/http/fetch/CMakeLists.darwin-x86_64.txt
index b507fb8c2e..553e7fc035 100644
--- a/library/cpp/http/fetch/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/http/fetch/CMakeLists.darwin-x86_64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 get_built_tool_path(
   TOOL_enum_parser_bin
   TOOL_enum_parser_dependency
@@ -18,7 +17,7 @@ add_library(cpp-http-fetch)
 target_link_libraries(cpp-http-fetch PUBLIC
   contrib-libs-cxxsupp
   yutil
-  ZLIB::ZLIB
+  contrib-libs-zlib
   library-cpp-charset
   cpp-digest-md5
   cpp-http-misc
diff --git a/library/cpp/http/fetch/CMakeLists.linux-aarch64.txt b/library/cpp/http/fetch/CMakeLists.linux-aarch64.txt
index 432831775a..4de49d554d 100644
--- a/library/cpp/http/fetch/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/http/fetch/CMakeLists.linux-aarch64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 get_built_tool_path(
   TOOL_enum_parser_bin
   TOOL_enum_parser_dependency
@@ -19,7 +18,7 @@ target_link_libraries(cpp-http-fetch PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  ZLIB::ZLIB
+  contrib-libs-zlib
   library-cpp-charset
   cpp-digest-md5
   cpp-http-misc
diff --git a/library/cpp/http/fetch/CMakeLists.linux-x86_64.txt b/library/cpp/http/fetch/CMakeLists.linux-x86_64.txt
index 432831775a..4de49d554d 100644
--- a/library/cpp/http/fetch/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/http/fetch/CMakeLists.linux-x86_64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 get_built_tool_path(
   TOOL_enum_parser_bin
   TOOL_enum_parser_dependency
@@ -19,7 +18,7 @@ target_link_libraries(cpp-http-fetch PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  ZLIB::ZLIB
+  contrib-libs-zlib
   library-cpp-charset
   cpp-digest-md5
   cpp-http-misc
diff --git a/library/cpp/http/fetch/CMakeLists.windows-x86_64.txt b/library/cpp/http/fetch/CMakeLists.windows-x86_64.txt
index b507fb8c2e..553e7fc035 100644
--- a/library/cpp/http/fetch/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/http/fetch/CMakeLists.windows-x86_64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 get_built_tool_path(
   TOOL_enum_parser_bin
   TOOL_enum_parser_dependency
@@ -18,7 +17,7 @@ add_library(cpp-http-fetch)
 target_link_libraries(cpp-http-fetch PUBLIC
   contrib-libs-cxxsupp
   yutil
-  ZLIB::ZLIB
+  contrib-libs-zlib
   library-cpp-charset
   cpp-digest-md5
   cpp-http-misc
diff --git a/library/cpp/monlib/encode/spack/CMakeLists.darwin-x86_64.txt b/library/cpp/monlib/encode/spack/CMakeLists.darwin-x86_64.txt
index 9eccd0b629..c8a1e929e1 100644
--- a/library/cpp/monlib/encode/spack/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/monlib/encode/spack/CMakeLists.darwin-x86_64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 
 add_library(monlib-encode-spack)
 target_link_libraries(monlib-encode-spack PUBLIC
@@ -16,7 +15,7 @@ target_link_libraries(monlib-encode-spack PUBLIC
   cpp-monlib-exception
   contrib-libs-lz4
   contrib-libs-xxhash
-  ZLIB::ZLIB
+  contrib-libs-zlib
   contrib-libs-zstd
 )
 target_sources(monlib-encode-spack PRIVATE
diff --git a/library/cpp/monlib/encode/spack/CMakeLists.linux-aarch64.txt b/library/cpp/monlib/encode/spack/CMakeLists.linux-aarch64.txt
index 118b926638..bc47de953d 100644
--- a/library/cpp/monlib/encode/spack/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/monlib/encode/spack/CMakeLists.linux-aarch64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 
 add_library(monlib-encode-spack)
 target_link_libraries(monlib-encode-spack PUBLIC
@@ -17,7 +16,7 @@ target_link_libraries(monlib-encode-spack PUBLIC
   cpp-monlib-exception
   contrib-libs-lz4
   contrib-libs-xxhash
-  ZLIB::ZLIB
+  contrib-libs-zlib
   contrib-libs-zstd
 )
 target_sources(monlib-encode-spack PRIVATE
diff --git a/library/cpp/monlib/encode/spack/CMakeLists.linux-x86_64.txt b/library/cpp/monlib/encode/spack/CMakeLists.linux-x86_64.txt
index 118b926638..bc47de953d 100644
--- a/library/cpp/monlib/encode/spack/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/monlib/encode/spack/CMakeLists.linux-x86_64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 
 add_library(monlib-encode-spack)
 target_link_libraries(monlib-encode-spack PUBLIC
@@ -17,7 +16,7 @@ target_link_libraries(monlib-encode-spack PUBLIC
   cpp-monlib-exception
   contrib-libs-lz4
   contrib-libs-xxhash
-  ZLIB::ZLIB
+  contrib-libs-zlib
   contrib-libs-zstd
 )
 target_sources(monlib-encode-spack PRIVATE
diff --git a/library/cpp/monlib/encode/spack/CMakeLists.windows-x86_64.txt b/library/cpp/monlib/encode/spack/CMakeLists.windows-x86_64.txt
index 9eccd0b629..c8a1e929e1 100644
--- a/library/cpp/monlib/encode/spack/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/monlib/encode/spack/CMakeLists.windows-x86_64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 
 add_library(monlib-encode-spack)
 target_link_libraries(monlib-encode-spack PUBLIC
@@ -16,7 +15,7 @@ target_link_libraries(monlib-encode-spack PUBLIC
   cpp-monlib-exception
   contrib-libs-lz4
   contrib-libs-xxhash
-  ZLIB::ZLIB
+  contrib-libs-zlib
   contrib-libs-zstd
 )
 target_sources(monlib-encode-spack PRIVATE
diff --git a/library/cpp/openssl/big_integer/CMakeLists.darwin-x86_64.txt b/library/cpp/openssl/big_integer/CMakeLists.darwin-x86_64.txt
index 64b7f8b472..79fa340e5f 100644
--- a/library/cpp/openssl/big_integer/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/openssl/big_integer/CMakeLists.darwin-x86_64.txt
@@ -6,13 +6,12 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-big_integer)
 target_link_libraries(cpp-openssl-big_integer PUBLIC
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
 )
 target_sources(cpp-openssl-big_integer PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/openssl/big_integer/big_integer.cpp
diff --git a/library/cpp/openssl/big_integer/CMakeLists.linux-aarch64.txt b/library/cpp/openssl/big_integer/CMakeLists.linux-aarch64.txt
index 3e17162a1f..859a9fb702 100644
--- a/library/cpp/openssl/big_integer/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/openssl/big_integer/CMakeLists.linux-aarch64.txt
@@ -6,14 +6,13 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-big_integer)
 target_link_libraries(cpp-openssl-big_integer PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
 )
 target_sources(cpp-openssl-big_integer PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/openssl/big_integer/big_integer.cpp
diff --git a/library/cpp/openssl/big_integer/CMakeLists.linux-x86_64.txt b/library/cpp/openssl/big_integer/CMakeLists.linux-x86_64.txt
index 3e17162a1f..859a9fb702 100644
--- a/library/cpp/openssl/big_integer/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/openssl/big_integer/CMakeLists.linux-x86_64.txt
@@ -6,14 +6,13 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-big_integer)
 target_link_libraries(cpp-openssl-big_integer PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
 )
 target_sources(cpp-openssl-big_integer PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/openssl/big_integer/big_integer.cpp
diff --git a/library/cpp/openssl/big_integer/CMakeLists.windows-x86_64.txt b/library/cpp/openssl/big_integer/CMakeLists.windows-x86_64.txt
index 64b7f8b472..79fa340e5f 100644
--- a/library/cpp/openssl/big_integer/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/openssl/big_integer/CMakeLists.windows-x86_64.txt
@@ -6,13 +6,12 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-big_integer)
 target_link_libraries(cpp-openssl-big_integer PUBLIC
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
 )
 target_sources(cpp-openssl-big_integer PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/openssl/big_integer/big_integer.cpp
diff --git a/library/cpp/openssl/crypto/CMakeLists.darwin-x86_64.txt b/library/cpp/openssl/crypto/CMakeLists.darwin-x86_64.txt
index d80e96fa54..869195583d 100644
--- a/library/cpp/openssl/crypto/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/openssl/crypto/CMakeLists.darwin-x86_64.txt
@@ -6,13 +6,12 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-crypto)
 target_link_libraries(cpp-openssl-crypto PUBLIC
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
   cpp-openssl-big_integer
   cpp-openssl-init
 )
diff --git a/library/cpp/openssl/crypto/CMakeLists.linux-aarch64.txt b/library/cpp/openssl/crypto/CMakeLists.linux-aarch64.txt
index 1465076efc..3271a4071c 100644
--- a/library/cpp/openssl/crypto/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/openssl/crypto/CMakeLists.linux-aarch64.txt
@@ -6,14 +6,13 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-crypto)
 target_link_libraries(cpp-openssl-crypto PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
   cpp-openssl-big_integer
   cpp-openssl-init
 )
diff --git a/library/cpp/openssl/crypto/CMakeLists.linux-x86_64.txt b/library/cpp/openssl/crypto/CMakeLists.linux-x86_64.txt
index 1465076efc..3271a4071c 100644
--- a/library/cpp/openssl/crypto/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/openssl/crypto/CMakeLists.linux-x86_64.txt
@@ -6,14 +6,13 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-crypto)
 target_link_libraries(cpp-openssl-crypto PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
   cpp-openssl-big_integer
   cpp-openssl-init
 )
diff --git a/library/cpp/openssl/crypto/CMakeLists.windows-x86_64.txt b/library/cpp/openssl/crypto/CMakeLists.windows-x86_64.txt
index d80e96fa54..869195583d 100644
--- a/library/cpp/openssl/crypto/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/openssl/crypto/CMakeLists.windows-x86_64.txt
@@ -6,13 +6,12 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-crypto)
 target_link_libraries(cpp-openssl-crypto PUBLIC
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
   cpp-openssl-big_integer
   cpp-openssl-init
 )
diff --git a/library/cpp/openssl/holders/CMakeLists.darwin-x86_64.txt b/library/cpp/openssl/holders/CMakeLists.darwin-x86_64.txt
index f0e455f3aa..02195bd183 100644
--- a/library/cpp/openssl/holders/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/openssl/holders/CMakeLists.darwin-x86_64.txt
@@ -6,13 +6,12 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-holders)
 target_link_libraries(cpp-openssl-holders PUBLIC
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
 )
 target_sources(cpp-openssl-holders PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/openssl/holders/bio.cpp
diff --git a/library/cpp/openssl/holders/CMakeLists.linux-aarch64.txt b/library/cpp/openssl/holders/CMakeLists.linux-aarch64.txt
index 59f7ba41c4..8855008beb 100644
--- a/library/cpp/openssl/holders/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/openssl/holders/CMakeLists.linux-aarch64.txt
@@ -6,14 +6,13 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-holders)
 target_link_libraries(cpp-openssl-holders PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
 )
 target_sources(cpp-openssl-holders PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/openssl/holders/bio.cpp
diff --git a/library/cpp/openssl/holders/CMakeLists.linux-x86_64.txt b/library/cpp/openssl/holders/CMakeLists.linux-x86_64.txt
index 59f7ba41c4..8855008beb 100644
--- a/library/cpp/openssl/holders/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/openssl/holders/CMakeLists.linux-x86_64.txt
@@ -6,14 +6,13 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-holders)
 target_link_libraries(cpp-openssl-holders PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
 )
 target_sources(cpp-openssl-holders PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/openssl/holders/bio.cpp
diff --git a/library/cpp/openssl/holders/CMakeLists.windows-x86_64.txt b/library/cpp/openssl/holders/CMakeLists.windows-x86_64.txt
index f0e455f3aa..02195bd183 100644
--- a/library/cpp/openssl/holders/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/openssl/holders/CMakeLists.windows-x86_64.txt
@@ -6,13 +6,12 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-holders)
 target_link_libraries(cpp-openssl-holders PUBLIC
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
 )
 target_sources(cpp-openssl-holders PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/openssl/holders/bio.cpp
diff --git a/library/cpp/openssl/init/CMakeLists.darwin-x86_64.txt b/library/cpp/openssl/init/CMakeLists.darwin-x86_64.txt
index 1ba4d2cebf..0e9d629f3a 100644
--- a/library/cpp/openssl/init/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/openssl/init/CMakeLists.darwin-x86_64.txt
@@ -6,13 +6,12 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-init)
 target_link_libraries(cpp-openssl-init PUBLIC
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
 )
 target_sources(cpp-openssl-init PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/openssl/init/init.cpp
diff --git a/library/cpp/openssl/init/CMakeLists.linux-aarch64.txt b/library/cpp/openssl/init/CMakeLists.linux-aarch64.txt
index cf53e73239..ddfa83213e 100644
--- a/library/cpp/openssl/init/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/openssl/init/CMakeLists.linux-aarch64.txt
@@ -6,14 +6,13 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-init)
 target_link_libraries(cpp-openssl-init PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
 )
 target_sources(cpp-openssl-init PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/openssl/init/init.cpp
diff --git a/library/cpp/openssl/init/CMakeLists.linux-x86_64.txt b/library/cpp/openssl/init/CMakeLists.linux-x86_64.txt
index cf53e73239..ddfa83213e 100644
--- a/library/cpp/openssl/init/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/openssl/init/CMakeLists.linux-x86_64.txt
@@ -6,14 +6,13 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-init)
 target_link_libraries(cpp-openssl-init PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
 )
 target_sources(cpp-openssl-init PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/openssl/init/init.cpp
diff --git a/library/cpp/openssl/init/CMakeLists.windows-x86_64.txt b/library/cpp/openssl/init/CMakeLists.windows-x86_64.txt
index 1ba4d2cebf..0e9d629f3a 100644
--- a/library/cpp/openssl/init/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/openssl/init/CMakeLists.windows-x86_64.txt
@@ -6,13 +6,12 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-init)
 target_link_libraries(cpp-openssl-init PUBLIC
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
 )
 target_sources(cpp-openssl-init PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/openssl/init/init.cpp
diff --git a/library/cpp/openssl/io/CMakeLists.darwin-x86_64.txt b/library/cpp/openssl/io/CMakeLists.darwin-x86_64.txt
index 51c040ccd3..bfd6c764e2 100644
--- a/library/cpp/openssl/io/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/openssl/io/CMakeLists.darwin-x86_64.txt
@@ -6,14 +6,13 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-io)
 target_link_libraries(cpp-openssl-io PUBLIC
   contrib-libs-cxxsupp
   yutil
   certs
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
   cpp-openssl-init
   cpp-openssl-method
 )
diff --git a/library/cpp/openssl/io/CMakeLists.linux-aarch64.txt b/library/cpp/openssl/io/CMakeLists.linux-aarch64.txt
index e932afdd60..c6d4c4d5b9 100644
--- a/library/cpp/openssl/io/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/openssl/io/CMakeLists.linux-aarch64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-io)
 target_link_libraries(cpp-openssl-io PUBLIC
@@ -14,7 +13,7 @@ target_link_libraries(cpp-openssl-io PUBLIC
   contrib-libs-cxxsupp
   yutil
   certs
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
   cpp-openssl-init
   cpp-openssl-method
 )
diff --git a/library/cpp/openssl/io/CMakeLists.linux-x86_64.txt b/library/cpp/openssl/io/CMakeLists.linux-x86_64.txt
index e932afdd60..c6d4c4d5b9 100644
--- a/library/cpp/openssl/io/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/openssl/io/CMakeLists.linux-x86_64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-io)
 target_link_libraries(cpp-openssl-io PUBLIC
@@ -14,7 +13,7 @@ target_link_libraries(cpp-openssl-io PUBLIC
   contrib-libs-cxxsupp
   yutil
   certs
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
   cpp-openssl-init
   cpp-openssl-method
 )
diff --git a/library/cpp/openssl/io/CMakeLists.windows-x86_64.txt b/library/cpp/openssl/io/CMakeLists.windows-x86_64.txt
index 51c040ccd3..bfd6c764e2 100644
--- a/library/cpp/openssl/io/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/openssl/io/CMakeLists.windows-x86_64.txt
@@ -6,14 +6,13 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-io)
 target_link_libraries(cpp-openssl-io PUBLIC
   contrib-libs-cxxsupp
   yutil
   certs
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
   cpp-openssl-init
   cpp-openssl-method
 )
diff --git a/library/cpp/openssl/method/CMakeLists.darwin-x86_64.txt b/library/cpp/openssl/method/CMakeLists.darwin-x86_64.txt
index fcca44537e..2a87fc259d 100644
--- a/library/cpp/openssl/method/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/openssl/method/CMakeLists.darwin-x86_64.txt
@@ -6,13 +6,12 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-method)
 target_link_libraries(cpp-openssl-method PUBLIC
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
   cpp-openssl-holders
 )
 target_sources(cpp-openssl-method PRIVATE
diff --git a/library/cpp/openssl/method/CMakeLists.linux-aarch64.txt b/library/cpp/openssl/method/CMakeLists.linux-aarch64.txt
index fab526fe7e..bda0d30708 100644
--- a/library/cpp/openssl/method/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/openssl/method/CMakeLists.linux-aarch64.txt
@@ -6,14 +6,13 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-method)
 target_link_libraries(cpp-openssl-method PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
   cpp-openssl-holders
 )
 target_sources(cpp-openssl-method PRIVATE
diff --git a/library/cpp/openssl/method/CMakeLists.linux-x86_64.txt b/library/cpp/openssl/method/CMakeLists.linux-x86_64.txt
index fab526fe7e..bda0d30708 100644
--- a/library/cpp/openssl/method/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/openssl/method/CMakeLists.linux-x86_64.txt
@@ -6,14 +6,13 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-method)
 target_link_libraries(cpp-openssl-method PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
   cpp-openssl-holders
 )
 target_sources(cpp-openssl-method PRIVATE
diff --git a/library/cpp/openssl/method/CMakeLists.windows-x86_64.txt b/library/cpp/openssl/method/CMakeLists.windows-x86_64.txt
index fcca44537e..2a87fc259d 100644
--- a/library/cpp/openssl/method/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/openssl/method/CMakeLists.windows-x86_64.txt
@@ -6,13 +6,12 @@
 # original buildsystem will not be accepted.
 
 
-find_package(OpenSSL REQUIRED)
 
 add_library(cpp-openssl-method)
 target_link_libraries(cpp-openssl-method PUBLIC
   contrib-libs-cxxsupp
   yutil
-  OpenSSL::OpenSSL
+  contrib-libs-openssl
   cpp-openssl-holders
 )
 target_sources(cpp-openssl-method PRIVATE