fix: set CMAKE_INSTALL_LIBDIR as lib #25
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Log: opencv 引入时使用 3rdparty/opencv-4.5.4/build/install/lib/libopencv_world.a，写死了 lib 路径，但是 CMAKE_INSTALL_LIBDIR 在一些 64 位系统中是 lib64
myk1343
pushed a commit
to myk1343/deepin-ocr
that referenced
this pull request
Mar 10, 2025
Log: opencv 引入时使用 3rdparty/opencv-4.5.4/build/install/lib/libopencv_world.a，写死了 lib 路径，但是 CMAKE_INSTALL_LIBDIR 在一些 64 位系统中是 lib64
myk1343
pushed a commit
to myk1343/deepin-ocr
that referenced
this pull request
Mar 10, 2025
Log: opencv 引入时使用 3rdparty/opencv-4.5.4/build/install/lib/libopencv_world.a，写死了 lib 路径，但是 CMAKE_INSTALL_LIBDIR 在一些 64 位系统中是 lib64
deepin-bot bot
pushed a commit
that referenced
this pull request
Mar 10, 2025
Log: opencv 引入时使用 3rdparty/opencv-4.5.4/build/install/lib/libopencv_world.a，写死了 lib 路径，但是 CMAKE_INSTALL_LIBDIR 在一些 64 位系统中是 lib64
lzwind
added a commit
that referenced
this pull request
Dec 2, 2025
* chore: Sync by linuxdeepin/.github@2e5e092 sync by github workflow Log: none Influence: none * chore: Sync by linuxdeepin/.github@559e911 sync by github workflow Log: none Influence: none * fix: set CMAKE_INSTALL_LIBDIR as lib (#25) Log: opencv 引入时使用 3rdparty/opencv-4.5.4/build/install/lib/libopencv_world.a，写死了 lib 路径，但是 CMAKE_INSTALL_LIBDIR 在一些 64 位系统中是 lib64 * chore: 安装路径Prefix规范化 安装路径Prefix规范化 Log: 安装路径Prefix规范化 * feat: 后端切换至dtkocr (#27) 后端切换至dtkocr Log: 后端切换至dtkocr * feat: 更新翻译文件 (#29) 更新翻译文件 Log: 更新翻译文件 * chore(CI): add OBS workflows add OBS workflows log: * chore(CI): fix lintian error log: * fix: 修改changelog 修改changelog Log: 修改changelog * fix: 修复编译错误 添加翻译配置文件 Log: 修复部分已知问题 * chore: Sync by linuxdeepin/.github@2e5e092 sync by github workflow Log: none Influence: none * chore: Sync by linuxdeepin/.github@559e911 sync by github workflow Log: none Influence: none * fix: Update changelog Update changelog Log: Update changelog * fix: wrong combobox window palette Fix wrong combobox window palette Log: Fix wrong combobox window palette Bug: https://pms.uniontech.com/bug-view-241599.html * feat: [translation]add transifex config add transifex config Log: add transifex config Task: https://pms.uniontech.com/task-view-361363.html * feat: Adapt Treeland Adapt Treeland, disable wayland settings in Treeland enviroment. Log: Adapt Treeland. * chore: update version update version Log: update version * fix: Fixed the Compact Mode issue (#42) Fixed the Compact Mode issue Bug: https://pms.uniontech.com/bug-view-202377.html Log: Fixed the Compact Mode issue * fix: rmove kwayland-shell rmove kwayland-shell Log: remove kwayland-shell * fix: ui modify ui modify Bug: https://pms.uniontech.com/bug-view-280015.html Log: ui modify * fix: 显示修改 显示修改 Bug: https://pms.uniontech.com/bug-view-280031.html Log: 显示修改 * fix: Optimized vulkan dependencies Optimized vulkan dependencies Log: Optimized vulkan dependencies * feat: Add DConfig source code. feat: 添加 DConfig 相关源代码。 * fix: On some device models, using GPU acceleration causes crashes. On some device models, using GPU acceleration during the OCR process leads to crashes during destruction. Now, the os-config solution is employed to customize these machines. fix: 某些机型上，使用GPU加速导致崩溃 在某些机型上，OCR过程中使用GPU加速，析构时会导致崩溃。现在使用os-config方案对这些机器进行定制。 * fix: Process crash caused by closing the application. When performing the destruction operation, it is necessary to wait for the child thread to exit to avoid errors in resource release. fix: 关闭应用引起进程崩溃 析构操作时，需要等待子线程退出，避免资源释放出错。 Bug: https://pms.uniontech.com/bug-view-334545.html * chore: Update build dependencies and translation file paths - Added libdtk6ocr-dev as alternative to libdtkocr-dev in Debian build dependencies - Added utils directory to CMake include paths and source directories - Updated translation file line number references across all language files to reflect code changes Log: Update build dependencies and translation references * chore: Add SPDX license header to install_dconfig.cmake - Added SPDX-FileCopyrightText for UnionTech Software Technology Co., Ltd. - Added SPDX-License-Identifier CC0-1.0 to CMake configuration file Log: Add license header to CMake configuration * chore: Update version to 6.5.14 - Merged release/eagle branch into master - Updated Debian changelog with new version entry Log: update version to 6.5.14 --------- Co-authored-by: deepin-admin-bot <deepin-admin-bot@deepin.org> Co-authored-by: rewine <luhongxu@deepin.org> Co-authored-by: houchengqiu <houchengqiu@uniontech.com> Co-authored-by: wzyforgit <wangzhengyang@uniontech.com> Co-authored-by: tsic404 <liuheng@deepin.org> Co-authored-by: pengfeixx <63588879+pengfeixx@users.noreply.github.com> Co-authored-by: renbin <renbin@uniontech.com> Co-authored-by: zhanghongyuan <zhanghongyuan@uniontech.com> Co-authored-by: Liu Zheng <liuzheng@uniontech.com> Co-authored-by: ut001910 <muyuankai@uniontech.com> Co-authored-by: xiepengfei <xiepengfei@uniontech.com> Co-authored-by: lichaofan <lichaofan@uniontech.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Log: opencv 引入时使用 3rdparty/opencv-4.5.4/build/install/lib/libopencv_world.a，写死了 lib 路径，但是 CMAKE_INSTALL_LIBDIR 在一些 64 位系统中是 lib64