From 6cd467abc28098e7c0f75bc4e5ba3017abb01ff7 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Thu, 16 Mar 2006 20:39:34 +0000 Subject: -implemented RPATH handling, set RPATH_STYLE to one of the following: default: compile with RPATH to the builddir, when installing link again with RPATH to the install dir, the kde lib dir and the Qt lib dir none: no RPATH at all install: compile with RPATH to the install dir, the kde lib dir and the Qt lib dir both: compiel with RPATH to the build dir, the install dir, the kde lib dir and the Qt lib dir -sync kde3 stuff with cmake cvs -fix building if kdewidgets and kstyles (get_target_properties doesn't work before the target is defined) Alex svn path=/trunk/KDE/kdelibs/; revision=519312 --- modules/FindQt4.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'modules/FindQt4.cmake') diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 1c337188..96db6164 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -143,6 +143,7 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS $ENV{QTDIR}/bin ${QT4_PATHS} NO_SYSTEM_PATH + NO_CMAKE_SYSTEM_PATH ) if (NOT QT_QMAKE_EXECUTABLE) @@ -533,6 +534,7 @@ if(QT4_QMAKE_FOUND) C:/Progra~1/qt/bin /usr/bin/qt4 NO_SYSTEM_PATH + NO_CMAKE_SYSTEM_PATH ) # if qmake wasn't found in the specific dirs, now check the system path @@ -572,6 +574,7 @@ if(QT4_QMAKE_FOUND) C:/Progra~1/qt/bin /usr/bin/qt4 NO_SYSTEM_PATH + NO_CMAKE_SYSTEM_PATH ) if (NOT QT_UIC_EXECUTABLE) -- cgit v1.2.1