fix: correct include path in pkg-config file#727
fix: correct include path in pkg-config file#727deepin-bot[bot] merged 1 commit intolinuxdeepin:masterfrom
Conversation
The pkg-config file was incorrectly specifying the include path as
${includedir}/dtk@DTK_VERSION_MAJOR@/DWidget. This path was too specific
and did not match the actual header file installation structure. The
change updates the Cflags to use the base ${includedir} directory,
allowing the compiler to find the DtkWidget headers in their correct
location.
This fix ensures that projects using pkg-config to locate DtkWidget
headers will find them properly without requiring manual include path
adjustments. The incorrect path was causing compilation failures in
dependent projects.
Influence:
1. Test compilation of projects that depend on DtkWidget using pkg-
config
2. Verify that include directives like #include <DWidget> work correctly
3. Check that both cmake and qmake projects can find DtkWidget headers
4. Test with different DTK versions to ensure version compatibility
5. Verify that existing projects don't break due to include path changes
fix: 修正 pkg-config 文件中的头文件包含路径
pkg-config 文件之前错误地将包含路径指定为 ${includedir}/
dtk@DTK_VERSION_MAJOR@/DWidget。这个路径过于具体,与实际的头文件安装结构
不匹配。此次更改将 Cflags 更新为使用基础的 ${includedir} 目录,使编译器
能够在正确的位置找到 DtkWidget 头文件。
此修复确保使用 pkg-config 定位 DtkWidget 头文件的项目能够正确找到它们,
而无需手动调整包含路径。之前的错误路径导致依赖项目编译失败。
Influence:
1. 测试使用 pkg-config 依赖 DtkWidget 的项目的编译
2. 验证 #include <DWidget> 等包含指令能正常工作
3. 检查 cmake 和 qmake 项目都能正确找到 DtkWidget 头文件
4. 使用不同 DTK 版本测试以确保版本兼容性
5. 验证现有项目不会因包含路径更改而出现问题
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: 18202781743, BLumia The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
deepin pr auto review这段代码修改涉及的是 pkg-config 配置文件( 以下是对该修改的详细审查意见: 1. 语法逻辑
改进建议:请确保该 2. 代码质量
改进建议:统一整个 DTK 生态中各个模块(Core, Gui, Widget)的 3. 代码性能
4. 代码安全
总结与建议这是一个影响 ABI(应用二进制接口)兼容性和构建系统的重大变更。
结论:如果这是为了适配新的头文件安装策略(去除了版本号目录层级),则修改是合理的;否则,这是一个破坏性的错误修改。 |
|
/forcemerge |
|
This pr force merged! (status: blocked) |
The pkg-config file was incorrectly specifying the include path as
${includedir}/dtk@DTK_VERSION_MAJOR@/DWidget. This path was too specific
and did not match the actual header file installation structure. The
change updates the Cflags to use the base ${includedir} directory,
allowing the compiler to find the DtkWidget headers in their correct
location.
This fix ensures that projects using pkg-config to locate DtkWidget
headers will find them properly without requiring manual include path
adjustments. The incorrect path was causing compilation failures in
dependent projects.
Influence:
config
fix: 修正 pkg-config 文件中的头文件包含路径
pkg-config 文件之前错误地将包含路径指定为 ${includedir}/
dtk@DTK_VERSION_MAJOR@/DWidget。这个路径过于具体,与实际的头文件安装结构
不匹配。此次更改将 Cflags 更新为使用基础的 ${includedir} 目录,使编译器
能够在正确的位置找到 DtkWidget 头文件。
此修复确保使用 pkg-config 定位 DtkWidget 头文件的项目能够正确找到它们,
而无需手动调整包含路径。之前的错误路径导致依赖项目编译失败。
Influence: