Skip to content
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

[7zip] Add complete public header files #27569

Merged
merged 7 commits into from
Nov 22, 2022
Merged

[7zip] Add complete public header files #27569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7902eb4
[7zip] Add complete public header files
FrankXie05 Oct 31, 2022
c9575db
version
FrankXie05 Oct 31, 2022
78337df
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
FrankXie05 Nov 22, 2022
5016555
simplify
FrankXie05 Nov 22, 2022
86210be
version
FrankXie05 Nov 22, 2022
568565c
add end line
FrankXie05 Nov 22, 2022
38c388a
vdb
FrankXie05 Nov 22, 2022
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
43 changes: 12 additions & 31 deletions ports/7zip/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,29 +398,6 @@ target_include_directories(7zip
$<INSTALL_INTERFACE:include>/7zip/CPP
)

set(PUBLIC_HEADERS
C/7zTypes.h
C/Alloc.h
C/LzFind.h
C/LzFindMt.h
C/LzHash.h
C/LzmaDec.h
C/LzmaEnc.h
C/LzmaLib.h
C/Threads.h
CPP/7zip/Archive/IArchive.h
CPP/7zip/ICoder.h
CPP/7zip/IDecl.h
CPP/7zip/IPassword.h
CPP/7zip/IProgress.h
CPP/7zip/IStream.h
CPP/7zip/PropID.h
CPP/Common/Defs.h
CPP/Common/MyTypes.h
CPP/Common/MyUnknown.h
CPP/Common/MyWindows.h
)

install(
TARGETS 7zip
EXPORT 7zip-targets
Expand All @@ -430,14 +407,18 @@ install(
)

# Headers makes relative includes so directory structure must be kept
foreach(HEADER ${PUBLIC_HEADERS})
get_filename_component(HEADER_DIR ${HEADER} DIRECTORY)
install(
FILES ${HEADER}
CONFIGURATIONS Release
DESTINATION include/7zip/${HEADER_DIR}
)
endforeach()

file(GLOB HEADERS "${CMAKE_CURRENT_LIST_DIR}/C/*.h")
install(FILES ${HEADERS} DESTINATION "include/7zip/C")

file(GLOB HEADERS "${CMAKE_CURRENT_LIST_DIR}/CPP/Common/*.h")
install(FILES ${HEADERS} DESTINATION "include/7zip/CPP/Common")

file(GLOB HEADERS "${CMAKE_CURRENT_LIST_DIR}/CPP/7zip/*.h")
install(FILES ${HEADERS} DESTINATION "include/7zip/CPP/7zip")

file(GLOB HEADERS "${CMAKE_CURRENT_LIST_DIR}/CPP/7zip/Archive/*.h")
install (FILES ${HEADERS} DESTINATION "include/7zip/CPP/7zip/Archive")

include(CMakePackageConfigHelpers)
configure_package_config_file(
Expand Down
2 changes: 2 additions & 0 deletions ports/7zip/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ file(
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
RENAME copyright
)

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
1 change: 1 addition & 0 deletions ports/7zip/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "7zip",
"version": "22.0",
"port-version": 1,
"description": "Library for archiving file with a high compression ratio.",
"homepage": "https://www.7-zip.org",
"license": "LGPL-2.1-or-later",
Expand Down
5 changes: 5 additions & 0 deletions versions/7-/7zip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3cbbaee3c546a24fc68b37759c9a5fc62b683ff0",
"version": "22.0",
"port-version": 1
},
{
"git-tree": "15ce7b0d1812f8640e74075ca9f5e3a08b3bc875",
"version": "22.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"7zip": {
"baseline": "22.0",
"port-version": 0
"port-version": 1
},
"ableton": {
"baseline": "3.0.5",
Expand Down