mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 10:49:06 +08:00
0ddcda32f1
Fixes #37197. - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [x] The "supports" clause reflects platforms that may be fixed by this new version. - [x] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. The update to version 5.6.0, includes the following changes * the patches were adapted for changes in the new version (I cannot check if the patch for iOS support was adapted correctly) * the new tools `lzmadec` and `lzmainfo` are handled in the same manner as the existing tools `xz` and `xzdec` * ~nls was disabled to sidestep an issue with installing the man pages~ * ~a new feature `nls` was added to enable native language support. This was necessary to handle a new optional dependency on `gettext` so that the existing `tools` feature continues to work.~ * nls support was not added, yet. See discussion below for details. I have successfully built * `liblzma:x86-windows`, * `liblzma:x64-windows`, * `liblzma:x64-linux`, * `liblzma[tools]:x64-linux`, Note that `tools` is not supported on `windows`. Requested by @Neustradamus EDIT 1: added nls feature EDIT 2: removed nls feature again
20 lines
545 B
Diff
20 lines
545 B
Diff
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1273,10 +1273,15 @@ set_target_properties(liblzma PROPERTIES
|
|
|
|
# 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
|
|
IMPORT_PREFIX ""
|
|
)
|
|
|
|
+if(WIN32 AND NOT MINGW)
|
|
+ set_target_properties(liblzma PROPERTIES RUNTIME_OUTPUT_NAME liblzma)
|
|
+endif()
|
|
+
|
|
+
|
|
# Create liblzma-config-version.cmake.
|
|
#
|
|
# FIXME: SameMajorVersion is correct for stable releases but it is wrong
|