Skip to content

[lzma] Locate correct release/debug libraries in static build #5625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
seanwarren wants to merge 5 commits into from
Closed

[lzma] Locate correct release/debug libraries in static build #5625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
72c7b56
[lzma] Locate correct release/debug libraries in static build using w…
Mar 11, 2019
ec7c11e
[liblzma] Whitespace change to trigger CI
Apr 8, 2019
89be696
Merge branch 'vcpkg-master' into fix-lzma-static-targets
Apr 8, 2019
aaaf9b7
Merge commit 'e16f9c29a05aa178ce8a476a293723ab92f08f89' into fix-lzma…
May 22, 2019
de0d196
Merge remote-tracking branch 'origin/master' into HEAD
ras0219-msft May 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/liblzma/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,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)

Expand Down
16 changes: 16 additions & 0 deletions ports/liblzma/vcpkg-cmake-wrapper.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
\$<\$<NOT:\$<CONFIG:DEBUG>>:${LIBLZMA_LIBRARY_RELEASE}>\$<\$<CONFIG:DEBUG>:${LIBLZMA_LIBRARY_DEBUG}>)
set(LIBLZMA_LIBRARY ${LIBLZMA_LIBRARY_RELEASE})
endif ()