Add libarchive dependency to cppan and sw builds.

Author: egorpugin

CMakeLists.txt

@@ -354,7 +354,10 @@ set_target_properties           (libtesseract PROPERTIES OUTPUT_NAME tesseract)
 endif()
 
 if (CPPAN_BUILD)
-    target_link_libraries       (libtesseract pvt.cppan.demo.danbloomberg.leptonica)
+    target_link_libraries       (libtesseract PUBLIC
+        pvt.cppan.demo.danbloomberg.leptonica
+        pvt.cppan.demo.libarchive.libarchive
+    )
     file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/TesseractTargets.cmake "include(${CMAKE_CURRENT_BINARY_DIR}/cppan.cmake)\n")
     export(TARGETS libtesseract APPEND FILE ${CMAKE_CURRENT_BINARY_DIR}/TesseractTargets.cmake)
 else()

cppan.yml

@@ -16,6 +16,7 @@ local_settings:
 
     dependencies:
         pvt.cppan.demo.danbloomberg.leptonica: 1
+        pvt.cppan.demo.libarchive.libarchive: 3
         pvt.cppan.demo.unicode.icu.i18n: "*"
 
 root_project: pvt.cppan.demo.google.tesseract
@@ -141,6 +142,7 @@ projects:
                 definitions:
                     public:
                       - HAVE_CONFIG_H
+                      - HAVE_LIBARCHIVE
                       - _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS=1
                       - WINDLLNAME="tesseract"
             shared:
@@ -152,6 +154,7 @@ projects:
 
         dependencies:
             pvt.cppan.demo.danbloomberg.leptonica: 1
+            pvt.cppan.demo.libarchive.libarchive: 3
 
     tesseract:
         files: src/api/tesseractmain.cpp

googletest

@@ -71,10 +71,12 @@ void build(Solution &s)
         libtesseract.Public += "HAVE_CONFIG_H"_d;
         libtesseract.Public += "WINDLLNAME=\"tesseract\""_d;
         libtesseract.Public += "_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS=1"_d;
+        libtesseract.Public += "HAVE_LIBARCHIVE"_d;
         libtesseract.Interface += sw::Shared, "TESS_IMPORTS"_d;
         libtesseract.Private += sw::Shared, "TESS_EXPORTS"_d;
 
         libtesseract.Public += "org.sw.demo.danbloomberg.leptonica-master"_dep;
+        libtesseract.Public += "org.sw.demo.libarchive.libarchive"_dep;
 
         if (s.Settings.TargetOS.Type == OSType::Windows)
             libtesseract.Public += "ws2_32.lib"_l;