diff -Nru cmake-2.8.12.2/debian/changelog cmake-2.8.12.2/debian/changelog --- cmake-2.8.12.2/debian/changelog 2014-02-24 14:46:59.000000000 +0000 +++ cmake-2.8.12.2/debian/changelog 2014-03-19 11:33:40.000000000 +0000 @@ -1,3 +1,11 @@ +cmake (2.8.12.2-0ubuntu3) trusty; urgency=medium + + [ Iain Lane ] + * MultiArchCross.cmake: Look for uic and qdbus{cpp2xml,xml2cpp} in + /usr/lib/$DEB_BUILD_MULTIARCH/qt5/bin/. (LP: #1294186) + + -- Dimitri John Ledkov Wed, 19 Mar 2014 11:33:40 +0000 + cmake (2.8.12.2-0ubuntu2) trusty; urgency=medium * Fix JNI detection on ppc64el. diff -Nru cmake-2.8.12.2/debian/MultiArchCross.cmake cmake-2.8.12.2/debian/MultiArchCross.cmake --- cmake-2.8.12.2/debian/MultiArchCross.cmake 2014-02-10 16:39:29.000000000 +0000 +++ cmake-2.8.12.2/debian/MultiArchCross.cmake 2014-03-19 11:33:13.000000000 +0000 @@ -67,6 +67,18 @@ add_executable(Qt5::rcc IMPORTED AND COMMAND "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/rcc") set_target_properties(Qt5::rcc PROPERTIES IMPORTED_LOCATION "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/rcc") endif() + if (NOT TARGET Qt5::uic) + add_executable(Qt5::uic IMPORTED AND COMMAND "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/uic") + set_target_properties(Qt5::uic PROPERTIES IMPORTED_LOCATION "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/uic") + endif() + if (NOT TARGET Qt5::qdbuscpp2xml) + add_executable(Qt5::qdbuscpp2xml IMPORTED AND COMMAND "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/qdbuscpp2xml") + set_target_properties(Qt5::qdbuscpp2xml PROPERTIES IMPORTED_LOCATION "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/qdbuscpp2xml") + endif() + if (NOT TARGET Qt5::qdbusxml2cpp) + add_executable(Qt5::qdbusxml2cpp IMPORTED AND COMMAND "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/qdbusxml2cpp") + set_target_properties(Qt5::qdbusxml2cpp PROPERTIES IMPORTED_LOCATION "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/qdbusxml2cpp") + endif() endif() endif() endif()