From 319a54ebd3761ea39bc8f03cb1e205feb7f3fee5 Mon Sep 17 00:00:00 2001 From: Alvin <52727318+AlvinZhangH@users.noreply.github.com> Date: Wed, 5 Feb 2020 07:32:13 +0800 Subject: [PATCH] [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 --- ports/liblzma/CONTROL | 2 +- 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)