Date: Fri, 25 Apr 2008 20:24:43 GMT From: Thierry Thomas <thierry@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kde@FreeBSD.org Subject: ports/123092: devel/cmake: fix Qt4 configuration. Message-ID: <200804252024.m3PKOhHp084534@freefall.freebsd.org> Resent-Message-ID: <200804252030.m3PKU2u4084672@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 123092 >Category: ports >Synopsis: devel/cmake: fix Qt4 configuration. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Apr 25 20:30:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 7.0-STABLE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD freefall.freebsd.org 7.0-STABLE FreeBSD 7.0-STABLE #34: Sat Apr 12 11:52:18 UTC 2008 simon@freefall.freebsd.org:/usr/src/sys/i386/compile/FREEFALL i386 >Description: When using cmake to build an application depending on Qt4, it fails to detect qmake-qt4 if qmake exists, and then even if moc-qt4 and uic-qt4 have been found, they are not registered. The following patch fixes these problems. >How-To-Repeat: Try to upgrade ParaView (the port science/paraview) to v. 3.2.x. >Fix: Please consider the hereunder patch: --- cmake.diff begins here --- diff -urN devel/cmake.orig/Makefile devel/cmake/Makefile --- devel/cmake.orig/Makefile 2008-04-25 22:07:06.000000000 +0200 +++ devel/cmake/Makefile 2008-04-25 17:46:13.000000000 +0200 @@ -7,6 +7,7 @@ PORTNAME= cmake PORTVERSION= 2.4.8 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ \ ${MASTER_SITE_LOCAL} diff -urN devel/cmake.orig/files/patch-Modules_FindQt4.cmake devel/cmake/files/patch-Modules_FindQt4.cmake --- devel/cmake.orig/files/patch-Modules_FindQt4.cmake 1970-01-01 01:00:00.000000000 +0100 +++ devel/cmake/files/patch-Modules_FindQt4.cmake 2008-04-25 21:45:34.000000000 +0200 @@ -0,0 +1,23 @@ +--- ./Modules/FindQt4.cmake.orig 2008-01-21 19:59:51.000000000 +0100 ++++ ./Modules/FindQt4.cmake 2008-04-25 21:45:15.000000000 +0200 +@@ -250,7 +250,7 @@ + + GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) + # check for qmake +-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS ++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake4 qmake PATHS + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" +@@ -790,9 +790,9 @@ + "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL) + + SET(QT_MOC_EXECUTABLE +- ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable") ++ ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable" FORCE) + SET(QT_UIC_EXECUTABLE +- ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable") ++ ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable" FORCE) + + FIND_PROGRAM(QT_UIC3_EXECUTABLE + NAMES uic3 --- cmake.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804252024.m3PKOhHp084534>