diff options
| author | Paulo Moura Guedes <moura@kdewebdev.org> | 2006-05-16 11:55:39 +0000 |
|---|---|---|
| committer | Paulo Moura Guedes <moura@kdewebdev.org> | 2006-05-16 11:55:39 +0000 |
| commit | 17bafed3abdc05904daed120fc22baf262dd16a3 (patch) | |
| tree | 01cc2a4949a90d342b08ea52022a1c5d4121c61d | |
| parent | ca1a3bc8885a44fec51e8fb2b3d53bc1fc9dda35 (diff) | |
| download | extra-cmake-modules-17bafed3abdc05904daed120fc22baf262dd16a3.tar.gz extra-cmake-modules-17bafed3abdc05904daed120fc22baf262dd16a3.tar.bz2 | |
Taken from cmake cvs. This fixes moc and uic for msys.
svn path=/trunk/KDE/kdelibs/; revision=541480
| -rw-r--r-- | modules/FindQt4.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index c559de44..2ae35870 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -648,8 +648,8 @@ IF (QT4_QMAKE_FOUND) # find moc and uic using qmake FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/CMakeTmpQmake/tmp.pro - "message("MOC <$$QMAKE_MOC>") - message("UIC <$$QMAKE_UIC>") + "message("MOC <$$QMAKE_MOC>") + message("UIC <$$QMAKE_UIC>") ") EXECUTE_PROCESS(COMMAND ${QT_QMAKE_EXECUTABLE} @@ -662,6 +662,9 @@ IF (QT4_QMAKE_FOUND) STRING(REGEX REPLACE ".*MOC<([^>]+).*" "\\1" QT_MOC_EXECUTABLE "${_moc_OUTPUT}" ) STRING(REGEX REPLACE ".*UIC<([^>]+).*" "\\1" QT_UIC_EXECUTABLE "${_moc_OUTPUT}" ) + FILE(TO_CMAKE_PATH "${QT_MOC_EXECUTABLE}" QT_MOC_EXECUTABLE) + FILE(TO_CMAKE_PATH "${QT_UIC_EXECUTABLE}" QT_UIC_EXECUTABLE) + SET(QT_MOC_EXECUTABLE ${QT_MOC_EXECUTABLE} CACHE FILEPATH "The moc executable") SET(QT_UIC_EXECUTABLE ${QT_UIC_EXECUTABLE} CACHE FILEPATH "The uic executable") |