Skip to content

Commit b00add3

Browse files
refactor: Remove pzip plugin and update CMake configuration
- Deleted the pzip plugin directory and its associated files, including CMakeLists.txt, source, and header files. - Updated CMakeLists.txt to reflect the removal of the pzip plugin, ensuring proper build configuration without it. - Adjusted the add_subdirectory command for pzip to use the correct source and binary directories. Log: Clean up project structure by removing the pzip plugin and updating build configurations accordingly.
1 parent 321d700 commit b00add3

24 files changed

+8
-4
lines changed

3rdparty/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ add_subdirectory(libzipplugin)
1616

1717
add_subdirectory(libminizipplugin)
1818

19-
# pzip 高性能并行压缩工具(仅 x86/ARM + Qt6 环境启用)
19+
# clipzipplugin(仅 x86/ARM + Qt6 环境启用,依赖 src/pzip
2020
if((CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm|x86_64|amd64") AND (QT_VERSION_MAJOR EQUAL 6))
2121
message(STATUS "x86/ARM + Qt6 环境,启用 pzip 高性能压缩插件")
22-
add_subdirectory(pzip)
2322
add_subdirectory(clipzipplugin)
2423
else()
2524
message(STATUS "非 x86/ARM + Qt6 环境,使用默认 libzip 插件")

3rdparty/clipzipplugin/clipzipplugin.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ QString CliPzipPlugin::getPzipPath() const
6767

6868
// 开发环境:尝试从应用程序目录查找
6969
QString appDir = QCoreApplication::applicationDirPath();
70-
QString devPath = appDir + "/../3rdparty/pzip/pzip";
70+
QString devPath = appDir + "/../src/pzip/pzip";
7171
if (QFileInfo::exists(devPath)) {
7272
return devPath;
7373
}
@@ -91,7 +91,7 @@ QString CliPzipPlugin::getPunzipPath() const
9191

9292
// 开发环境:尝试从应用程序目录查找
9393
QString appDir = QCoreApplication::applicationDirPath();
94-
QString devPath = appDir + "/../3rdparty/pzip/punzip";
94+
QString devPath = appDir + "/../src/pzip/punzip";
9595
if (QFileInfo::exists(devPath)) {
9696
return devPath;
9797
}

src/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,8 @@ install(FILES ${CMAKE_CURRENT_LIST_DIR}/com.deepin.Compressor.service
143143
# Install DBus interface XML file
144144
install(FILES ${CMAKE_CURRENT_LIST_DIR}/com.deepin.Compressor.xml
145145
DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/interfaces/)
146+
147+
# pzip 高性能并行压缩工具(仅 x86/ARM + Qt6 环境启用)
148+
if((CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm|x86_64|amd64") AND (QT_VERSION_MAJOR EQUAL 6))
149+
add_subdirectory(pzip)
150+
endif()

0 commit comments

Comments
 (0)