[acquire/CMakeLists.txt] Fix handling of checksums and unarchive libs ; [acquire/acquire_miniz.h] Use my new vcpkg upgrade of this port with a reasonably deep include hierarchy ; [acquire/acquire_crc32c.h] Add missing include to resolve undefined symbol error

Author: SamuelMarks

acquire/CMakeLists.txt

@@ -350,14 +350,7 @@ else ()
         message(STATUS "[libacquire] Using var ${CHECKSUM_LIBRARIES} for checksums")
         target_link_libraries("${LIBRARY_NAME}" PUBLIC "${CHECKSUM_LIBRARIES}")
         target_compile_definitions("${LIBRARY_NAME}" PRIVATE "${CHECKSUM_LIBRARIES_USE}=1")
-    elseif (LIBACQUIRE_USE_CRC32C)
-        message(STATUS "[libacquire] Using internal CRC32C implementation")
-        target_compile_definitions("${LIBRARY_NAME}" PRIVATE LIBACQUIRE_USE_CRC32C=1)
-    else ()
-        message(FATAL_ERROR "No checksum implementation selected: define `LIBACQUIRE_USE_LIBRHASH` or `LIBACQUIRE_USE_CRC32C`")
-    endif ()
-
-    if (LIBACQUIRE_USE_LIBRHASH)
+    elseif (LIBACQUIRE_USE_LIBRHASH)
         message(STATUS "[libacquire] Using LibRHash for checksums")
 
         find_package(LibRHash REQUIRED)
@@ -372,10 +365,22 @@ else ()
         else ()
             message(STATUS "${LIBRARY_NAME} already linked with '${_lib}'")
         endif (lib_index EQUAL -1)
-    elseif (LIBACQUIRE_USE_MINIZ)
+    elseif (LIBACQUIRE_USE_CRC32C)
+        message(STATUS "[libacquire] Using internal CRC32C implementation")
+        target_compile_definitions("${LIBRARY_NAME}" PRIVATE LIBACQUIRE_USE_CRC32C=1)
+    else ()
+        message(FATAL_ERROR "No checksum implementation selected: define `LIBACQUIRE_USE_LIBRHASH` or `LIBACQUIRE_USE_CRC32C`")
+    endif ()
+
+    if (LIBACQUIRE_USE_MINIZ)
         find_package(kubazip CONFIG REQUIRED)
         target_compile_definitions("${LIBRARY_NAME}" PRIVATE LIBACQUIRE_USE_MINIZ=1)
-        target_link_libraries("${EXEC_NAME}" PRIVATE kubazip::kubazip)
+        target_link_libraries("${LIBRARY_NAME}" PRIVATE kubazip::kubazip)
+    elseif (LIBACQUIRE_USE_LIBARCHIVE)
+        target_compile_definitions("${LIBRARY_NAME}" PRIVATE LIBACQUIRE_USE_LIBARCHIVE=1)
+        target_link_libraries("${LIBRARY_NAME}" PRIVATE "${LibArchive_LIBRARIES}")
+    else ()
+        message(FATAL_ERROR "No unarchive implementation selected: define `LIBACQUIRE_USE_LIBARCHIVE` or `LIBACQUIRE_USE_MINIZ`")
     endif ()
 
     if (NOT BSD)

acquire/acquire_crc32c.h

@@ -26,6 +26,8 @@ extern "C" {
 #endif /* defined(WIN32) || defined(_WIN32) || defined(__WIN32__) ||           \
 defined(__NT__) */
 
+#include "acquire_checksums.h"
+
 /*
  * Taken from FreeBSD implementation of CRC32C, specifically:
  * - usr.bin\cksum\crc32_algo.c @ d91d2b513eb30a226e87f0e52e2f9f232a2e1ca3

acquire/acquire_miniz.h

@@ -11,7 +11,7 @@ extern "C" {
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <kubazip/zip/zip.h>
+#include <kubazip/zip.h>
 
 #include "acquire_errors.h"
 #include "acquire_extract.h"