diff options
| author | Brad King <brad.king@kitware.com> | 2012-09-11 19:01:29 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-09-11 19:01:29 (GMT) |
| commit | 19fdc456a0ff851f6f2a433f9d2354e3e5201d38 (patch) | |
| tree | d3841550af7cad008435048030af5f3321602a88 | |
| parent | 53568bd9b5181cfcc2acd2051f922cc2ecd83afa (diff) | |
| parent | 5c25df10acea6ca2948392d680e6cae26b3127df (diff) | |
| download | CMake-19fdc456a0ff851f6f2a433f9d2354e3e5201d38.zip CMake-19fdc456a0ff851f6f2a433f9d2354e3e5201d38.tar.gz CMake-19fdc456a0ff851f6f2a433f9d2354e3e5201d38.tar.bz2 | |
Merge topic 'fix-qt-dbus-on-mac-problem'
5c25df1 FindQt4: Avoid "finding" non-existent library in a .framework
| -rw-r--r-- | Modules/FindQt4.cmake | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 95fb8a4..a84074b 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -885,6 +885,18 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) NAMES ${QT_MODULE}${QT_LIBINFIX}_debug ${QT_MODULE}${QT_LIBINFIX}d ${QT_MODULE}${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH ) + if(QT_${_upper_qt_module}_LIBRARY_RELEASE MATCHES "/${QT_MODULE}\\.framework$") + if(NOT EXISTS "${QT_${_upper_qt_module}_LIBRARY_RELEASE}/${QT_MODULE}") + # Release framework library file does not exist... Force to NOTFOUND: + set(QT_${_upper_qt_module}_LIBRARY_RELEASE "QT_${_upper_qt_module}_LIBRARY_RELEASE-NOTFOUND" CACHE FILEPATH "Path to a library." FORCE) + endif() + endif() + if(QT_${_upper_qt_module}_LIBRARY_DEBUG MATCHES "/${QT_MODULE}\\.framework$") + if(NOT EXISTS "${QT_${_upper_qt_module}_LIBRARY_DEBUG}/${QT_MODULE}") + # Debug framework library file does not exist... Force to NOTFOUND: + set(QT_${_upper_qt_module}_LIBRARY_DEBUG "QT_${_upper_qt_module}_LIBRARY_DEBUG-NOTFOUND" CACHE FILEPATH "Path to a library." FORCE) + endif() + endif() endforeach() # QtUiTools is sometimes not in the same directory as the other found libraries |