On Wednesday, April 10, 2013 17:14:53 Rex Dieter wrote: > Stephen Kelly wrote: > > On Wednesday, April 10, 2013 09:23:10 Rex Dieter wrote: > >> As a followup, qt-5.0.2 + the cmake patch mentioned elsewhere in this > >> thread, we're down to a single failure (which looks a *lot* like the > > > >> problem of the other modules we fixed already): > > Great! That's progress at least. > > > > Are the updated/patched packages downloadable somewhere? I don't think I > > see them here: > > http://koji.fedoraproject.org/koji/packageinfo?packageID=15742 > > > >> Error: cmake execution failed > >> CMake Warning at /usr/lib64/cmake/Qt5Core/Qt5CoreMacros.cmake:237 > >> > >> (find_package): > >> Could not find a package configuration file provided by "Qt5Test" with > >> any > >> > >> of the following names: > > This is also a Qt bug. Please test the patch at: > > https://codereview.qt-project.org/53449 > > On the surface, that looks like it would help, but didn't seem to, I still > get the same failure using that patch too.
Indeed, my patch is wrong and will probably fail to integrate. I was sure I tested it, but I guess I didn't :). Please try the attached instead. I can't update the patch in gerrit until it finishes integrating. Thanks, -- Stephen Kelly <[email protected]> | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions
>From cffce0d2b6f2d5cc80ee5f360899c42369d2267d Mon Sep 17 00:00:00 2001 From: Stephen Kelly <[email protected]> Date: Wed, 10 Apr 2013 17:28:27 +0200 Subject: [PATCH] Make qt5_use_modules find dependents only in the parent directory. Similar to 70420ec3 (Look for cmake package dependents only in the parent directory., 2013-04-02), make sure this cmake function only searches for sibling packages as dependencies. Change-Id: Icab23d333fa6a750ee262b592fae39f0ba334fee --- src/corelib/Qt5CoreMacros.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake index e3115db..b6124b4 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -215,6 +215,7 @@ function(QT5_ADD_RESOURCES outfiles ) set(${outfiles} ${${outfiles}} PARENT_SCOPE) endfunction() +set(_Qt5_COMPONENT_PATH "${CMAKE_CURRENT_LIST_DIR}/..") if (NOT CMAKE_VERSION VERSION_LESS 2.8.9) macro(qt5_use_modules _target _link_type) @@ -234,7 +235,7 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.9) foreach(_module ${_qt5_modules}) if (NOT Qt5${_module}_FOUND) - find_package(Qt5${_module} PATHS ${_qt5Core_install_prefix} NO_DEFAULT_PATH) + find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH) if (NOT Qt5${_module}_FOUND) message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.") endif() -- 1.8.1.2
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Development mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/development
