diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-03-16 20:39:34 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-03-16 20:39:34 +0000 |
| commit | 6cd467abc28098e7c0f75bc4e5ba3017abb01ff7 (patch) | |
| tree | b0a701f0884aeeb7269900f4c17b7415c33e2683 /modules/FindQt4.cmake | |
| parent | 8e8d825a0203381639f8a9a94713ad9fb985ff7b (diff) | |
| download | extra-cmake-modules-6cd467abc28098e7c0f75bc4e5ba3017abb01ff7.tar.gz extra-cmake-modules-6cd467abc28098e7c0f75bc4e5ba3017abb01ff7.tar.bz2 | |
-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
Diffstat (limited to 'modules/FindQt4.cmake')
| -rw-r--r-- | modules/FindQt4.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
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) |