[7zip] Add complete public header files (microsoft#27569)

* [7zip] Add complete public header files * version * simplify * version * add end line * vdb
SupSuper · Nov 22, 2022 · 6b49f83 · 6b49f83
1 parent 4a88177
commit 6b49f83
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 32 deletions.
diff --git a/ports/7zip/CMakeLists.txt b/ports/7zip/CMakeLists.txt
@@ -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
@@ -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(

diff --git a/ports/7zip/portfile.cmake b/ports/7zip/portfile.cmake
@@ -28,3 +28,5 @@ file(
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
     RENAME copyright
 )
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json
@@ -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",

diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3cbbaee3c546a24fc68b37759c9a5fc62b683ff0",
+      "version": "22.0",
+      "port-version": 1
+    },
     {
       "git-tree": "15ce7b0d1812f8640e74075ca9f5e3a08b3bc875",
       "version": "22.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6,7 +6,7 @@
     },
     "7zip": {
       "baseline": "22.0",
-      "port-version": 0
+      "port-version": 1
     },
     "ableton": {
       "baseline": "3.0.5",