Intermediate changes

conanfile.txt

@@ -1,8 +1,5 @@
 [requires]
-c-ares/1.19.1
 libiconv/1.15
-openssl/1.1.1s
-zlib/1.2.13
 
 [tool_requires]
 bison/3.8.2

contrib/libs/CMakeLists.darwin-x86_64.txt

@@ -11,6 +11,7 @@ add_subdirectory(apache)
 add_subdirectory(aws-sdk-cpp)
 add_subdirectory(base64)
 add_subdirectory(brotli)
+add_subdirectory(c-ares)
 add_subdirectory(cctz)
 add_subdirectory(crcutil)
 add_subdirectory(curl)
@@ -45,6 +46,7 @@ add_subdirectory(miniselect)
 add_subdirectory(nayuki_md5)
 add_subdirectory(nghttp2)
 add_subdirectory(openldap)
+add_subdirectory(openssl)
 add_subdirectory(opentelemetry-proto)
 add_subdirectory(pcre)
 add_subdirectory(pdqsort)
@@ -63,5 +65,6 @@ add_subdirectory(utf8proc)
 add_subdirectory(xxhash)
 add_subdirectory(yajl)
 add_subdirectory(yaml-cpp)
+add_subdirectory(zlib)
 add_subdirectory(zstd)
 add_subdirectory(zstd06)

contrib/libs/CMakeLists.linux-aarch64.txt

@@ -11,6 +11,7 @@ add_subdirectory(apache)
 add_subdirectory(aws-sdk-cpp)
 add_subdirectory(base64)
 add_subdirectory(brotli)
+add_subdirectory(c-ares)
 add_subdirectory(cctz)
 add_subdirectory(crcutil)
 add_subdirectory(curl)
@@ -46,6 +47,7 @@ add_subdirectory(miniselect)
 add_subdirectory(nayuki_md5)
 add_subdirectory(nghttp2)
 add_subdirectory(openldap)
+add_subdirectory(openssl)
 add_subdirectory(opentelemetry-proto)
 add_subdirectory(pcre)
 add_subdirectory(pdqsort)
@@ -65,5 +67,6 @@ add_subdirectory(utf8proc)
 add_subdirectory(xxhash)
 add_subdirectory(yajl)
 add_subdirectory(yaml-cpp)
+add_subdirectory(zlib)
 add_subdirectory(zstd)
 add_subdirectory(zstd06)

contrib/libs/CMakeLists.linux-x86_64.txt

@@ -11,6 +11,7 @@ add_subdirectory(apache)
 add_subdirectory(aws-sdk-cpp)
 add_subdirectory(base64)
 add_subdirectory(brotli)
+add_subdirectory(c-ares)
 add_subdirectory(cctz)
 add_subdirectory(crcutil)
 add_subdirectory(curl)
@@ -47,6 +48,7 @@ add_subdirectory(miniselect)
 add_subdirectory(nayuki_md5)
 add_subdirectory(nghttp2)
 add_subdirectory(openldap)
+add_subdirectory(openssl)
 add_subdirectory(opentelemetry-proto)
 add_subdirectory(pcre)
 add_subdirectory(pdqsort)
@@ -66,5 +68,6 @@ add_subdirectory(utf8proc)
 add_subdirectory(xxhash)
 add_subdirectory(yajl)
 add_subdirectory(yaml-cpp)
+add_subdirectory(zlib)
 add_subdirectory(zstd)
 add_subdirectory(zstd06)

contrib/libs/CMakeLists.windows-x86_64.txt

@@ -11,6 +11,7 @@ add_subdirectory(apache)
 add_subdirectory(aws-sdk-cpp)
 add_subdirectory(base64)
 add_subdirectory(brotli)
+add_subdirectory(c-ares)
 add_subdirectory(cctz)
 add_subdirectory(crcutil)
 add_subdirectory(curl)
@@ -41,6 +42,7 @@ add_subdirectory(lzma)
 add_subdirectory(lzmasdk)
 add_subdirectory(miniselect)
 add_subdirectory(nayuki_md5)
+add_subdirectory(openssl)
 add_subdirectory(opentelemetry-proto)
 add_subdirectory(pcre)
 add_subdirectory(poco)
@@ -57,5 +59,6 @@ add_subdirectory(utf8proc)
 add_subdirectory(xxhash)
 add_subdirectory(yajl)
 add_subdirectory(yaml-cpp)
+add_subdirectory(zlib)
 add_subdirectory(zstd)
 add_subdirectory(zstd06)

contrib/libs/apache/arrow/CMakeLists.darwin-x86_64.txt

@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 get_built_tool_path(
   TOOL_flatc_bin
   TOOL_flatc_dependency
@@ -92,7 +91,7 @@ target_link_libraries(libs-apache-arrow PUBLIC
   contrib-libs-snappy
   contrib-libs-utf8proc
   contrib-libs-xxhash
-  ZLIB::ZLIB
+  contrib-libs-zlib
   contrib-libs-zstd
   contrib-restricted-fast_float
   contrib-restricted-thrift

contrib/libs/apache/arrow/CMakeLists.linux-aarch64.txt

@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 get_built_tool_path(
   TOOL_flatc_bin
   TOOL_flatc_dependency
@@ -93,7 +92,7 @@ target_link_libraries(libs-apache-arrow PUBLIC
   contrib-libs-snappy
   contrib-libs-utf8proc
   contrib-libs-xxhash
-  ZLIB::ZLIB
+  contrib-libs-zlib
   contrib-libs-zstd
   contrib-restricted-fast_float
   contrib-restricted-thrift

contrib/libs/apache/arrow/CMakeLists.linux-x86_64.txt

@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 get_built_tool_path(
   TOOL_flatc_bin
   TOOL_flatc_dependency
@@ -93,7 +92,7 @@ target_link_libraries(libs-apache-arrow PUBLIC
   contrib-libs-snappy
   contrib-libs-utf8proc
   contrib-libs-xxhash
-  ZLIB::ZLIB
+  contrib-libs-zlib
   contrib-libs-zstd
   contrib-restricted-fast_float
   contrib-restricted-thrift

contrib/libs/apache/arrow/CMakeLists.windows-x86_64.txt

@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 get_built_tool_path(
   TOOL_flatc_bin
   TOOL_flatc_dependency
@@ -91,7 +90,7 @@ target_link_libraries(libs-apache-arrow PUBLIC
   contrib-libs-snappy
   contrib-libs-utf8proc
   contrib-libs-xxhash
-  ZLIB::ZLIB
+  contrib-libs-zlib
   contrib-libs-zstd
   contrib-restricted-fast_float
   contrib-restricted-thrift

contrib/libs/apache/orc/CMakeLists.darwin-x86_64.txt

@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-find_package(ZLIB REQUIRED)
 get_built_tool_path(
   TOOL_protoc_bin
   TOOL_protoc_dependency
@@ -37,7 +36,7 @@ target_link_libraries(libs-apache-orc PUBLIC
   contrib-libs-cxxsupp
   contrib-libs-lz4
   contrib-libs-snappy
-  ZLIB::ZLIB
+  contrib-libs-zlib
   contrib-libs-zstd
   contrib-libs-protobuf
 )