diff options
| author | Alvin <52727318+AlvinZhangH@users.noreply.github.com> | 2020-02-05 07:32:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-04 15:32:13 -0800 |
| commit | 319a54ebd3761ea39bc8f03cb1e205feb7f3fee5 (patch) | |
| tree | d876ed3d088b1c00f26dc895e7fca2efaacb9d0b | |
| parent | d808514c9df44bb97d6eccff952bfe8ec4e156f7 (diff) | |
| download | vcpkg-319a54ebd3761ea39bc8f03cb1e205feb7f3fee5.tar.gz vcpkg-319a54ebd3761ea39bc8f03cb1e205feb7f3fee5.zip | |
[liblzma] Fix build failure (#7481)
* fix 7426 issue
* fix 7426 issue -change the CONTROL file
* [liblzma] Remove quantlib:x64-os from ci.baseline.txt
* [liblzma] Update the CONTROL version
| -rw-r--r-- | ports/liblzma/CONTROL | 2 | ||||
| -rw-r--r-- | ports/liblzma/portfile.cmake | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ports/liblzma/CONTROL b/ports/liblzma/CONTROL index 1148fbb52..2c44c3d16 100644 --- a/ports/liblzma/CONTROL +++ b/ports/liblzma/CONTROL @@ -1,4 +1,4 @@ Source: liblzma -Version: 5.2.4-3 +Version: 5.2.4-4 Homepage: https://github.com/xz-mirror/xz Description: Compression library with an API similar to that of zlib. diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake index e7260309b..20d2a59d6 100644 --- a/ports/liblzma/portfile.cmake +++ b/ports/liblzma/portfile.cmake @@ -74,7 +74,11 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) file(APPEND ${CURRENT_PACKAGES_DIR}/share/liblzma/LibLZMAConfig.cmake "add_definitions(-DLZMA_API_STATIC)") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +if (VCPKG_BUILD_TYPE STREQUAL debug) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include) +else() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +endif() file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblzma) |