diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2007-12-11 17:57:54 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2007-12-11 17:57:54 (GMT) |
| commit | 1d4a87b00136b356d991f16f3c97e06661df0537 (patch) | |
| tree | a1a366581eb5042e3c2c08e5896ded13716ea9a5 /Modules | |
| parent | b0078fd3b4738ed51634f9e720cff3a2cb0032aa (diff) | |
| download | CMake-1d4a87b00136b356d991f16f3c97e06661df0537.zip CMake-1d4a87b00136b356d991f16f3c97e06661df0537.tar.gz CMake-1d4a87b00136b356d991f16f3c97e06661df0537.tar.bz2 | |
ENH: Correctly find UiTools library on Mac w/ binary install of Qt.
Fixes #4554.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 62307d5..15b57cd 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -643,6 +643,10 @@ IF (QT4_QMAKE_FOUND) # Set QT_QTUITOOLS_LIBRARY FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_RELEASE NAMES QtUiTools QtUiTools4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_DEBUG NAMES QtUiTools_debug QtUiToolsd QtUiToolsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + # QtUiTools not with other frameworks with binary installation (in /usr/lib) + IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE) + FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_RELEASE NAMES QtUiTools PATHS ${QT_LIBRARY_DIR}) + ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE) # Set QT_QTTEST_LIBRARY FIND_LIBRARY(QT_QTTEST_LIBRARY_RELEASE NAMES QtTest QtTest4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) |