ENH: fix path problem with qt
This commit is contained in:
parent
0d99f6073c
commit
2c80b0fa70
|
@ -656,10 +656,12 @@ IF (QT4_QMAKE_FOUND)
|
||||||
STRING(REGEX REPLACE ".*MOC<([^>]+).*" "\\1" QT_MOC_EXECUTABLE_INTERNAL "${_moc_OUTPUT}" )
|
STRING(REGEX REPLACE ".*MOC<([^>]+).*" "\\1" QT_MOC_EXECUTABLE_INTERNAL "${_moc_OUTPUT}" )
|
||||||
STRING(REGEX REPLACE ".*UIC<([^>]+).*" "\\1" QT_UIC_EXECUTABLE_INTERNAL "${_moc_OUTPUT}" )
|
STRING(REGEX REPLACE ".*UIC<([^>]+).*" "\\1" QT_UIC_EXECUTABLE_INTERNAL "${_moc_OUTPUT}" )
|
||||||
|
|
||||||
|
FILE(TO_CMAKE_PATH ${QT_MOC_EXECUTABLE_INTERNAL} QT_MOC_EXECUTABLE_INTERNAL)
|
||||||
|
FILE(TO_CMAKE_PATH ${QT_UIC_EXECUTABLE_INTERNAL} QT_UIC_EXECUTABLE_INTERNAL)
|
||||||
|
|
||||||
SET(QT_MOC_EXECUTABLE ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable")
|
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")
|
SET(QT_UIC_EXECUTABLE ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable")
|
||||||
|
|
||||||
|
|
||||||
FIND_PROGRAM(QT_UIC3_EXECUTABLE
|
FIND_PROGRAM(QT_UIC3_EXECUTABLE
|
||||||
NAMES uic3
|
NAMES uic3
|
||||||
PATHS ${QT_BINARY_DIR}
|
PATHS ${QT_BINARY_DIR}
|
||||||
|
|
Loading…
Reference in New Issue