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.

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

fix: fix header include location in CMake and pkg-config #114

Merged
merged 1 commit into from
Sep 26, 2024

Conversation

topazus
Copy link
Contributor

@topazus topazus commented Sep 25, 2024

fix header include location in CMake and pkg-config

fix header include location in CMake and pkg-config
@deepin-ci-robot
Copy link

Hi @topazus. Thanks for your PR. 😃

@deepin-ci-robot
Copy link

Hi @topazus. Thanks for your PR.

I'm waiting for a linuxdeepin member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@topazus
Copy link
Contributor Author

topazus commented Sep 25, 2024

Without this PR, deepin-album which depends on this will build failed when using qt6.

FAILED: src/CMakeFiles/deepin-album.dir/deepin-album_autogen/mocs_compilation.cpp.o 
/usr/bin/g++ -DDDECLARATIVE_TRANSLATIONS_DIR=\"dtk6/DDeclarative/translations\" -DDSG_DATA_DIR=\"/usr/share/dsg\" -DDSYSINFO_PREFIX=\"\" -DDTK_QML_APP_PLUGIN_PATH=\"/usr//usr/lib64/dtk6declarative/qml-app\" -DDTK_QML_APP_PLUGIN_SUBPATH=\"dtkdeclarative/plugins\" -DPREFIX=\"/usr\" -DQT_CONCURRENT_LIB -DQT_CORE_LIB -DQT_DBUS_LIB -DQT_GUI_LIB -DQT_MESSAGELOGCONTEXT -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_PRINTSUPPORT_LIB -DQT_QMLBUILTINS_LIB -DQT_QMLINTEGRATION_LIB -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_QUICK_LIB -DQT_SQL_LIB -DQT_SVG_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -I/builddir/build/BUILD/deepin-album-6.0.8-build/deepin-album-6.0.8/redhat-linux-build/src -I/builddir/build/BUILD/deepin-album-6.0.8-build/deepin-album-6.0.8/src -I/builddir/build/BUILD/deepin-album-6.0.8-build/deepin-album-6.0.8/redhat-linux-build/src/deepin-album_autogen/include -I/builddir/build/BUILD/deepin-album-6.0.8-build/deepin-album-6.0.8/redhat-linux-build -I/usr/include/dfm-mount -I/builddir/build/BUILD/deepin-album-6.0.8-build/deepin-album-6.0.8/src/src -I/usr/include/ffmpeg -isystem /usr/include/qt6/QtQuick -isystem /usr/include/qt6 -isystem /usr/include/qt6/QtCore -isystem /usr/lib64/qt6/mkspecs/linux-g++ -isystem /usr/include/qt6/QtGui -isystem /usr/include/qt6/QtQml -isystem /usr/include/qt6/QtQmlIntegration -isystem /usr/include/qt6/QtQmlBuiltins -isystem /usr/include/qt6/QtNetwork -isystem /usr/include/qt6/QtQmlModels -isystem /usr/include/qt6/QtOpenGL -isystem /usr/include/qt6/QtPrintSupport -isystem /usr/include/qt6/QtWidgets -isystem /usr/include/qt6/QtDBus -isystem /usr/include/qt6/QtConcurrent -isystem /usr/include/qt6/QtSvg -isystem /usr/include/qt6/QtSql -isystem /usr/include/dtk6/DWidget -isystem /usr/include/dtk6/DGui -isystem /usr/include/dtk6/DCore -isystem /usr/include/qt6/QtXml -isystem /usr/include/dtk6/DLog -isystem /usr/include/dtk6/DDeclarative -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -O3 -std=gnu++17 -MD -MT src/CMakeFiles/deepin-album.dir/deepin-album_autogen/mocs_compilation.cpp.o -MF src/CMakeFiles/deepin-album.dir/deepin-album_autogen/mocs_compilation.cpp.o.d -o src/CMakeFiles/deepin-album.dir/deepin-album_autogen/mocs_compilation.cpp.o -c /builddir/build/BUILD/deepin-album-6.0.8-build/deepin-album-6.0.8/redhat-linux-build/src/deepin-album_autogen/mocs_compilation.cpp
In file included from /builddir/build/BUILD/deepin-album-6.0.8-build/deepin-album-6.0.8/redhat-linux-build/src/deepin-album_autogen/UVLADIE3JM/moc_albumControl.cpp:9,
                 from /builddir/build/BUILD/deepin-album-6.0.8-build/deepin-album-6.0.8/redhat-linux-build/src/deepin-album_autogen/mocs_compilation.cpp:2:
/builddir/build/BUILD/deepin-album-6.0.8-build/deepin-album-6.0.8/redhat-linux-build/src/deepin-album_autogen/UVLADIE3JM/../../../../src/src/albumControl.h:14:10: fatal error: dfm-mount/ddevicemanager.h: No such file or directory
   14 | #include <dfm-mount/ddevicemanager.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.

The PR as a patch is tested on Fedora, the deepin-music built against qt6 successfully: https://copr.fedorainfracloud.org/coprs/topazus/test/build/8066224/, https://copr.fedorainfracloud.org/coprs/topazus/test/build/8066315/

@Johnson-zs Johnson-zs merged commit 2d2b2da into linuxdeepin:master Sep 26, 2024
17 of 19 checks passed
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Johnson-zs, topazus

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@topazus topazus deleted the fix branch September 26, 2024 04:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants