diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-10-13 15:23:44 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-10-13 15:23:44 (GMT) |
| commit | 4d890194265f00214148c6b7c8abd0996fb3ab54 (patch) | |
| tree | 29cb4be91401500fadf5b12b8a2ef4e226a26700 /Modules | |
| parent | 870f2aeb2e732ad580d72546686673e82616f0b1 (diff) | |
| download | CMake-4d890194265f00214148c6b7c8abd0996fb3ab54.zip CMake-4d890194265f00214148c6b7c8abd0996fb3ab54.tar.gz CMake-4d890194265f00214148c6b7c8abd0996fb3ab54.tar.bz2 | |
BUG: fix for bug#3898 find qt plugin dir
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 0b0c9be..e146e63 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -75,6 +75,8 @@ # QT_QTTEST_INCLUDE_DIR Path to "include/QtTest" # # QT_LIBRARY_DIR Path to "lib" of Qt4 +# +# QT_PLUGINS_DIR Path to "plugins" for Qt4 # # For every library of Qt there are three variables: # QT_QTFOO_LIBRARY_RELEASE, which contains the full path to the release version @@ -317,6 +319,13 @@ IF (QT4_QMAKE_FOUND) SET(QT_MKSPECS_DIR ${qt_mkspecs_dir} CACHE PATH "The location of the Qt mkspecs") ENDIF (NOT QT_MKSPECS_DIR) + # ask qmake for the plugins directory + IF (NOT QT_PLUGINS_DIR) + EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE} + ARGS "-query QT_INSTALL_PLUGINS" + OUTPUT_VARIABLE qt_plugins_dir ) + SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins") + ENDIF (NOT QT_PLUGINS_DIR) ######################################## # # Setting the INCLUDE-Variables |