From 72c7b56832dde32e8bb98b97ba936133aeaae189 Mon Sep 17 00:00:00 2001 From: Sean Warren Date: Mon, 11 Mar 2019 12:48:23 +1100 Subject: [PATCH 1/2] [lzma] Locate correct release/debug libraries in static build using wrapper --- ports/liblzma/CONTROL | 2 +- ports/liblzma/portfile.cmake | 1 + ports/liblzma/vcpkg-cmake-wrapper.cmake | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 ports/liblzma/vcpkg-cmake-wrapper.cmake diff --git a/ports/liblzma/CONTROL b/ports/liblzma/CONTROL index 20c26f9804c935..c94576a3f35d65 100644 --- a/ports/liblzma/CONTROL +++ b/ports/liblzma/CONTROL @@ -1,3 +1,3 @@ Source: liblzma -Version: 5.2.4 +Version: 5.2.4-1 Description: Compression library with an API similar to that of zlib. diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake index 26b8bff783ce13..0a6532ca26adc8 100644 --- a/ports/liblzma/portfile.cmake +++ b/ports/liblzma/portfile.cmake @@ -32,6 +32,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) ${CMAKE_CURRENT_LIST_DIR}/auto-define-lzma-api-static.patch) endif() +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblzma) file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblzma) file(RENAME ${CURRENT_PACKAGES_DIR}/share/liblzma/COPYING ${CURRENT_PACKAGES_DIR}/share/liblzma/copyright) diff --git a/ports/liblzma/vcpkg-cmake-wrapper.cmake b/ports/liblzma/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..0711cb70fdc801 --- /dev/null +++ b/ports/liblzma/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,16 @@ +_find_package(${ARGS}) + +find_library(LIBLZMA_LIBRARY_RELEASE + lzma + PATHS ${CMAKE_CURRENT_LIST_DIR}/../../lib + NO_DEFAULT_PATH) +find_library(LIBLZMA_LIBRARY_DEBUG + lzma + PATHS ${CMAKE_CURRENT_LIST_DIR}/../../debug/lib + NO_DEFAULT_PATH) + +if (LIBLZMA_LIBRARY_RELEASE) + set(LIBLZMA_LIBRARIES + \$<\$>:${LIBLZMA_LIBRARY_RELEASE}>\$<\$:${LIBLZMA_LIBRARY_DEBUG}>) + set(LIBLZMA_LIBRARY ${LIBLZMA_LIBRARY_RELEASE}) +endif () \ No newline at end of file From ec7c11e34c8cfeb8ed082968602f14520bb4673a Mon Sep 17 00:00:00 2001 From: Sean Warren Date: Mon, 8 Apr 2019 14:42:36 +1000 Subject: [PATCH 2/2] [liblzma] Whitespace change to trigger CI --- ports/liblzma/vcpkg-cmake-wrapper.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/liblzma/vcpkg-cmake-wrapper.cmake b/ports/liblzma/vcpkg-cmake-wrapper.cmake index 0711cb70fdc801..e15f1929d235f1 100644 --- a/ports/liblzma/vcpkg-cmake-wrapper.cmake +++ b/ports/liblzma/vcpkg-cmake-wrapper.cmake @@ -13,4 +13,4 @@ if (LIBLZMA_LIBRARY_RELEASE) set(LIBLZMA_LIBRARIES \$<\$>:${LIBLZMA_LIBRARY_RELEASE}>\$<\$:${LIBLZMA_LIBRARY_DEBUG}>) set(LIBLZMA_LIBRARY ${LIBLZMA_LIBRARY_RELEASE}) -endif () \ No newline at end of file +endif ()