BUG: Revert 1.138.
This commit is contained in:
parent
0e03bd1ab4
commit
25eeb3c47c
|
@ -752,9 +752,30 @@ IF (QT4_QMAKE_FOUND)
|
||||||
#######################################
|
#######################################
|
||||||
|
|
||||||
|
|
||||||
|
# find moc and uic using qmake
|
||||||
|
QT_QUERY_QMAKE(QT_MOC_EXECUTABLE_INTERNAL "QMAKE_MOC")
|
||||||
|
QT_QUERY_QMAKE(QT_UIC_EXECUTABLE_INTERNAL "QMAKE_UIC")
|
||||||
|
|
||||||
|
# make sure we have / and not \ as qmake gives on windows
|
||||||
|
FILE(TO_CMAKE_PATH
|
||||||
|
"${QT_MOC_EXECUTABLE_INTERNAL}" QT_MOC_EXECUTABLE_INTERNAL)
|
||||||
|
# make sure we have / and not \ as qmake gives on windows
|
||||||
|
FILE(TO_CMAKE_PATH
|
||||||
|
"${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL)
|
||||||
|
|
||||||
|
IF(QT_QMAKE_CHANGED)
|
||||||
|
SET(QT_MOC_EXECUTABLE
|
||||||
|
${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable" FORCE)
|
||||||
|
SET(QT_UIC_EXECUTABLE
|
||||||
|
${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable" FORCE)
|
||||||
|
ELSE(QT_QMAKE_CHANGED)
|
||||||
|
SET(QT_MOC_EXECUTABLE
|
||||||
|
${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable")
|
||||||
|
SET(QT_UIC_EXECUTABLE
|
||||||
|
${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable")
|
||||||
|
ENDIF(QT_QMAKE_CHANGED)
|
||||||
|
|
||||||
IF(QT_QMAKE_CHANGED)
|
IF(QT_QMAKE_CHANGED)
|
||||||
SET(QT_MOC_EXECUTABLE NOTFOUND)
|
|
||||||
SET(QT_UIC_EXECUTABLE NOTFOUND)
|
|
||||||
SET(QT_UIC3_EXECUTABLE NOTFOUND)
|
SET(QT_UIC3_EXECUTABLE NOTFOUND)
|
||||||
SET(QT_RCC_EXECUTABLE NOTFOUND)
|
SET(QT_RCC_EXECUTABLE NOTFOUND)
|
||||||
SET(QT_DBUSCPP2XML_EXECUTABLE NOTFOUND)
|
SET(QT_DBUSCPP2XML_EXECUTABLE NOTFOUND)
|
||||||
|
@ -762,18 +783,6 @@ IF (QT4_QMAKE_FOUND)
|
||||||
SET(QT_LUPDATE_EXECUTABLE NOTFOUND)
|
SET(QT_LUPDATE_EXECUTABLE NOTFOUND)
|
||||||
SET(QT_LRELEASE_EXECUTABLE NOTFOUND)
|
SET(QT_LRELEASE_EXECUTABLE NOTFOUND)
|
||||||
ENDIF(QT_QMAKE_CHANGED)
|
ENDIF(QT_QMAKE_CHANGED)
|
||||||
|
|
||||||
FIND_PROGRAM(QT_MOC_EXECUTABLE
|
|
||||||
NAMES moc
|
|
||||||
PATHS ${QT_BINARY_DIR}
|
|
||||||
NO_DEFAULT_PATH
|
|
||||||
)
|
|
||||||
|
|
||||||
FIND_PROGRAM(QT_UIC_EXECUTABLE
|
|
||||||
NAMES uic
|
|
||||||
PATHS ${QT_BINARY_DIR}
|
|
||||||
NO_DEFAULT_PATH
|
|
||||||
)
|
|
||||||
|
|
||||||
FIND_PROGRAM(QT_UIC3_EXECUTABLE
|
FIND_PROGRAM(QT_UIC3_EXECUTABLE
|
||||||
NAMES uic3
|
NAMES uic3
|
||||||
|
|
Loading…
Reference in New Issue