[liblzma] Generally fix output name (#20751)

* Really fix output names

* Fix parameter warning

* Update versions

ports/liblzma/portfile.cmake

@@ -13,7 +13,7 @@ vcpkg_from_github(
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
+    OPTIONS_DEBUG
         "-DCMAKE_DEBUG_POSTFIX=d" # This was in the old vcpkg CMakeLists.txt and I don't intend to fix it all over vcpkg 
 )
 vcpkg_cmake_install()
@@ -45,13 +45,10 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/share/liblzma/liblzma-config.cmake" "include
 file(APPEND "${CURRENT_PACKAGES_DIR}/share/liblzma/liblzmaConfig.cmake"
 "
 include(\${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
-find_path(LibLZMA_INCLUDE_DIR
-    NAMES lzma.h
-    PATH_SUFFIXES lzma
-)
+find_path(LibLZMA_INCLUDE_DIR NAMES lzma.h PATHS \"\${_IMPORT_PREFIX}/include\" NO_DEFAULT_PATH REQUIRED)
 if(NOT LibLZMA_LIBRARY)
-    find_library(LibLZMA_LIBRARY_RELEASE NAMES lzma LZMA LibLZMA liblzma PATHS \${_IMPORT_PREFIX}/lib/)
-    find_library(LibLZMA_LIBRARY_DEBUG NAMES lzmad LZMAd LibLZMAd lzma LZMA LibLZMA liblzma PATHS \${_IMPORT_PREFIX}/debug/lib/)
+    find_library(LibLZMA_LIBRARY_RELEASE NAMES lzma PATHS \"\${_IMPORT_PREFIX}/lib\" NO_DEFAULT_PATH)
+    find_library(LibLZMA_LIBRARY_DEBUG NAMES lzmad PATHS \"\${_IMPORT_PREFIX}/debug/lib\" NO_DEFAULT_PATH)
     select_library_configurations(LibLZMA)
 endif()
 set(LibLZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\")

ports/liblzma/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "liblzma",
   "version-semver": "5.2.5",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Compression library with an API similar to that of zlib.",
   "homepage": "hhttps://github.com/xz-mirror/xz",
   "dependencies": [

ports/liblzma/win_output_name.patch

@@ -1,17 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 120dc7548..728ca3591 100644
+index e80b524..1ecf908 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -398,11 +398,12 @@ else()
- endif()
+@@ -429,7 +429,7 @@ set_target_properties(liblzma PROPERTIES
  
- if(WIN32)
-+    set_target_properties(liblzma PROPERTIES OUTPUT_NAME lzma)
-     if(BUILD_SHARED_LIBS)
-         # Add the Windows resource file for liblzma.dll.
-         target_sources(liblzma PRIVATE src/liblzma/liblzma_w32res.rc)
-         target_include_directories(liblzma PRIVATE windows/vs2019)
+     # It's liblzma.so or liblzma.dll, not libliblzma.so or lzma.dll.
+     # Avoid the name lzma.dll because it would conflict with LZMA SDK.
+-    PREFIX ""
++    OUTPUT_NAME lzma
+ )
  
-         # Export the public API symbols with __declspec(dllexport).
-         target_compile_definitions(liblzma PRIVATE DLL_EXPORT)
-     else()
+ # Create liblzmaConfigVersion.cmake.

versions/baseline.json

@@ -3558,7 +3558,7 @@
     },
     "liblzma": {
       "baseline": "5.2.5",
-      "port-version": 3
+      "port-version": 4
     },
     "libmad": {
       "baseline": "0.15.1",

versions/l-/liblzma.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "273eaeff533f90bc42394cca9f1ea23ff6b49534",
+      "version-semver": "5.2.5",
+      "port-version": 4
+    },
     {
       "git-tree": "2c5f893c8d78d30c4641e9f4d0c7818386f8c8c9",
       "version-semver": "5.2.5",