Merge ~santoshbit2007/oxide:systemInfo_buildfix into oxide:master

Proposed by Santosh
Status: Merged
Approved by: Chris Coulson
Approved revision: c359042b0fc7c06378b4635f9bbdc8a509ccdf96
Merge reported by: Santosh
Merged at revision: not available
Proposed branch: ~santoshbit2007/oxide:systemInfo_buildfix
Merge into: oxide:master
Diff against target: 21 lines (+10/-0)
1 file modified
build/cmake/qt/ProjectInit.cmake (+10/-0)
Reviewer Review Type Date Requested Status
Chris Coulson Approve
Review via email: mp+315007@code.launchpad.net

Description of the change

Cross Compiling oxide after installing qtsystem5-dev fails due to cmake error.
This is similar issue to QtConfigExtra looking for arm version of moc where host version of moc is needed.

// error -->

CMake Error at /usr/lib/arm-linux-gnueabihf/cmake/Qt5DBus/Qt5DBusConfig.cmake:27 (message):
  The imported target "Qt5::DBus" references the file

     "/usr/lib/arm-linux-gnueabihf/qt5/bin/qdbuscpp2xml"

  but this file does not exist. Possible reasons include:

  * The file was deleted, renamed, or moved to another location.

  * An install or uninstall procedure did not complete successfully.

  * The installation package was faulty and contained

     "/usr/lib/arm-linux-gnueabihf/cmake/Qt5DBus/Qt5DBusConfigExtras.cmake"

  but not all the files it references.

Call Stack (most recent call first):
  /usr/lib/arm-linux-gnueabihf/cmake/Qt5DBus/Qt5DBusConfigExtras.cmake:6 (_qt5_DBus_check_file_exists)
  /usr/lib/arm-linux-gnueabihf/cmake/Qt5DBus/Qt5DBusConfig.cmake:158 (include)
  /usr/lib/arm-linux-gnueabihf/cmake/Qt5SystemInfo/Qt5SystemInfoConfig.cmake:100 (find_package)
  oxide/build/cmake/ChromiumBuildShim.cmake:271 (find_package)

To post a comment you must log in.
Revision history for this message
Chris Coulson (chrisccoulson) wrote :

Thanks for this - I've approved it with 1 minor comment.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/build/cmake/qt/ProjectInit.cmake b/build/cmake/qt/ProjectInit.cmake
2index 7431792..aebd2f8 100644
3--- a/build/cmake/qt/ProjectInit.cmake
4+++ b/build/cmake/qt/ProjectInit.cmake
5@@ -32,6 +32,16 @@ if(CMAKE_CROSSCOMPILING)
6 add_executable(Qt5::uic IMPORTED)
7 endif()
8
9+ # Dummy targets to restrict Qt5DBusConfigExtras.cmake looking for
10+ # qdbuscpp2xml and qdbusxml2cpp when cross-compiling
11+ if(NOT TARGET Qt5::qdbuscpp2xml)
12+ add_executable(Qt5::qdbuscpp2xml IMPORTED)
13+ endif()
14+ if(NOT TARGET Qt5::qdbusxml2cpp)
15+ add_executable(Qt5::qdbusxml2cpp IMPORTED)
16+ endif()
17+
18+
19 # QT_MOC_EXECUTABLE is set by Qt5CoreConfigExtras, but it sets it to
20 # the target executable rather than the host executable, which is no
21 # use for cross-compiling. For cross-compiling, we have a guess and

Subscribers

People subscribed via source and target branches

to all changes: