diff options
| author | Brad King <brad.king@kitware.com> | 2013-03-13 17:37:26 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-03-13 17:37:26 (GMT) |
| commit | 18029b1e77be2b8df64ab6240c67b00c09ed8ce2 (patch) | |
| tree | 0a2d4149adcc0cd515b8cfb59a1e0a4a68fdd4f5 /Modules | |
| parent | 0c1621ff950991425b92d21afabed7e5a6cbbfda (diff) | |
| parent | 161a79378136d71ae26d26d78d62d997a4be1672 (diff) | |
| download | CMake-18029b1e77be2b8df64ab6240c67b00c09ed8ce2.zip CMake-18029b1e77be2b8df64ab6240c67b00c09ed8ce2.tar.gz CMake-18029b1e77be2b8df64ab6240c67b00c09ed8ce2.tar.bz2 | |
Merge topic 'findqt4-withqt5'
161a793 FindQt4: Fix QT_QMAKE{_QMAKE => }_EXECUTABLE typo
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 590a86e..1dd2782 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -561,7 +561,7 @@ function(_QT4_FIND_QMAKE QMAKE_NAMES QMAKE_RESULT VERSION_RESULT) endif() - set(${QMAKE_RESULT} "${QT_QMAKE_QMAKE_EXECUTABLE}" PARENT_SCOPE) + set(${QMAKE_RESULT} "${QT_QMAKE_EXECUTABLE}" PARENT_SCOPE) set(${VERSION_RESULT} "${QTVERSION}" PARENT_SCOPE) endfunction() |