[acquire/CMakeLists.txt] Fix bug (typo) causing linker errors on curl target ; [acquire/tests/test_checksum.h] Have different checksum for Windows encoding vs non-Windows (UTF-16 with BOM vs UTF-8? - or ASCII?)

Author: SamuelMarks

acquire/CMakeLists.txt

@@ -160,7 +160,7 @@ else ()
         set(NETWORK_LIB "acquire_wininet.h")
         set(NETWORK_LIB_LINK "wininet")
     elseif (LIBACQUIRE_USE_LIBCURL)
-        set(ARCHIVE_LIB "acquire_libcurl.h")
+        set(NETWORK_LIB "acquire_libcurl.h")
         set(NETWORK_LIB_LINK CURL::libcurl)
     elseif (LIBACQUIRE_USE_OPENBSD_FTP)
         set(NETWORK_LIB "acquire_openbsd_ftp.h")
@@ -173,6 +173,9 @@ else ()
     message(STATUS "header_impls = ${header_impls}")
 
     foreach (header_file IN LISTS header_impls)
+        if (header_file STREQUAL "")
+            continue()
+        endif (header_file STREQUAL "")
         get_filename_component(name_no_ext "${header_file}" NAME_WE)
         set(gen_header_file "${CMAKE_BINARY_DIR}/gen/gen_${name_no_ext}.h")
         set(gen_source_file "${CMAKE_BINARY_DIR}/gen/gen_${name_no_ext}.c")
@@ -221,13 +224,13 @@ else ()
         # Checksums #
         #############
         if (src MATCHES "/gen_acquire_checksums.c$")
-            # if (NOT ("LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" IN_LIST impls))
-            set_source_files_properties(
-                    ${src} PROPERTIES
-                    COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1"
-            )
-            # list(APPEND impls "LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL")
-            # endif (NOT ("LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" IN_LIST impls))
+            if (NOT ("LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" IN_LIST impls))
+                set_source_files_properties(
+                        ${src} PROPERTIES
+                        COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL=1"
+                )
+                list(APPEND impls "LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL")
+            endif (NOT ("LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" IN_LIST impls))
         elseif (src MATCHES "/gen_acquire_crc32c.c$")
             if (NOT ("LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL" IN_LIST impls))
                 set_source_files_properties(

acquire/acquire_libcurl.h

@@ -31,7 +31,9 @@ extern "C" {
 
 #include <curl/curl.h>
 
+#ifdef LIBACQUIRE_DOWNLOAD_DIR_IMPL
 const char *get_download_dir(void) { return ".downloads"; }
+#endif /* LIBACQUIRE_DOWNLOAD_DIR_IMPL */
 
 int download_to_stdout(const char *url, const char *checksum,
                        const char *target_location, bool follow, size_t retry) {

acquire/acquire_wincompressapi.h

@@ -283,8 +283,8 @@ int extract_archive(enum Archive archive, const char *archive_filepath,
 #endif /* __cplusplus */
 
 #endif /* defined(LIBACQUIRE_USE_WINCOMPRESSAPI) &&                            \
-          LIBACQUIRE_USE_WINCOMPRESSAPI && defined(LIBACQUIRE_IMPLEMENTATION)                                            \
-          && defined(LIBACQUIRE_EXTRACT_IMPL) && (defined(_WIN32) ||                                                           \
+          LIBACQUIRE_USE_WINCOMPRESSAPI && defined(LIBACQUIRE_IMPLEMENTATION)  \
+          && defined(LIBACQUIRE_EXTRACT_IMPL) && (defined(_WIN32) ||           \
           defined(__WIN32__) || defined(_MSC_VER) || defined(__MINGW32__)) */
 
 #endif /* !LIBACQUIRE_ACQUIRE_WINCOMPRESSAPI_H */

acquire/acquire_wininet.h

@@ -43,7 +43,7 @@ extern "C" {
 
 #ifdef LIBACQUIRE_DOWNLOAD_DIR_IMPL
 const char *get_download_dir(void) { return TMPDIR "//.downloads"; }
-#endif /* !LIBACQUIRE_DOWNLOAD_DIR_IMPL */
+#endif /* LIBACQUIRE_DOWNLOAD_DIR_IMPL */
 
 #ifdef LIBACQUIRE_DOWNLOAD_IMPL
 int download(const char *url, enum Checksum checksum, const char *hash,

acquire/tests/test_checksum.h

@@ -248,7 +248,11 @@ TEST test_crc32c_small_temp_file(void) {
   char *const tmpfile = create_temp_file_with_content(content);
   /* Precomputed CRC32C checksum of "hello, world\n" is: 0xb8ca70d7 (lowercase
    * hex) */
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
   const bool result = crc32c(tmpfile, "8f00b46e");
+#else
+  const bool result = crc32c(tmpfile, "f4247453");
+#endif /* defined(_MSC_VER) && !defined(__INTEL_COMPILER) */
   /* f4247453 */
   ASSERT(tmpfile != NULL);
   safe_remove_file(tmpfile);
@@ -260,9 +264,13 @@ TEST test_sha256_small_temp_file(void) {
   const char *content = "hello, world\n";
   char *const tmpfile = create_temp_file_with_content(content);
   /* Precomputed SHA256 of "hello, world\n" */
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
   const char *const expected_sha256 =
       "bbbe3b671e853dfe30a0e60594366f24f02f31ea24ff4651743fd60c73cd6822";
-  /* 853ff93762a06ddbf722c4ebe9ddd66d8f63ddaea97f521c3ecc20da7c976020 */
+#else
+  const char *const expected_sha256 =
+      "853ff93762a06ddbf722c4ebe9ddd66d8f63ddaea97f521c3ecc20da7c976020";
+#endif /* defined(_MSC_VER) && !defined(__INTEL_COMPILER) */
   const bool result = sha256(tmpfile, expected_sha256);
   ASSERT(tmpfile != NULL);
   safe_remove_file(tmpfile);

cmake/FindCurlCustom.cmake

@@ -21,7 +21,7 @@ function(get_curl LINK_LIBRARIES)
     if (VCPKG_TOOLCHAIN)  # Overly specific, should be same for conan, Buckaroo, Hunter, &etc.
         find_package(CURL CONFIG QUIET)
         if (CURL_FOUND)
-            set("${LINK_LIBRARIES}" "CURL::libcurl" PARENT_SCOPE)
+            set("${LINK_LIBRARIES}" CURL::libcurl PARENT_SCOPE)
             return()
         endif (CURL_FOUND)
     endif (VCPKG_TOOLCHAIN)
@@ -64,7 +64,7 @@ function(get_curl LINK_LIBRARIES)
                             INTERFACE_LINK_LIBRARIES "${CURL_STATIC_LIBRARIES}"
                             IMPORTED_LINK_INTERFACE_LANGUAGES C
                             IMPORTED_LOCATION "${CURL_LINK_LIBRARIES}")
-                    target_link_libraries(CURL::libcurl INTERFACE "${CURL_STATIC_LIBRARY_DIRS}")
+                    # target_link_libraries(CURL::libcurl INTERFACE "${CURL_STATIC_LIBRARY_DIRS}")
                 else ()
                     add_library(CURL::libcurl SHARED IMPORTED)
                     set_target_properties(CURL::libcurl PROPERTIES

cmake/FindExtractLib.cmake

@@ -18,7 +18,7 @@ function(set_extract_lib)
         list(APPEND _Header_Files "acquire_zlib.h")
     else ()
         set(LIBACQUIRE_USE_MINIZ 1 PARENT_SCOPE)
-        set(EXTRACT_LIB "MINIZ" PARENT_SCOPE)
+        set(EXTRACT_LIB "kubazip::kubazip" PARENT_SCOPE)
         list(APPEND _Header_Files "acquire_miniz.h")
     endif ()
 endfunction(set_extract_lib)

cmake/FindLibAcquire.cmake

@@ -31,7 +31,7 @@ function(set_networking_lib HTTPS_LIBRARY)
     endif ()
 
     if (DEFINED LIBACQUIRE_USE_LIBCURL AND DEFINED CURL_LINK_LIBRARIES)
-        set(HTTPS_LIBRARY "${CURL_LINK_LIBRARIES}" PARENT_SCOPE)
+        set(HTTPS_LIBRARY "CURL::libcurl" PARENT_SCOPE)
     elseif (DEFINED LIBACQUIRE_USE_WININET)
         set(HTTPS_LIBRARY "wininet" PARENT_SCOPE)
         if (NOT DEFINED LIBACQUIRE_USE_OPENSSL)