From fcd09ca90ff052fbb560d8b1eff3e465066bb13b Mon Sep 17 00:00:00 2001 From: Clinton Stimpson Date: Mon, 7 Apr 2008 11:23:02 -0400 Subject: [PATCH] BUG: Fix 6726. Create correct moc rule for configured headers in binary dir. --- Modules/FindQt4.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 40616646b..e2f0971bc 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -992,7 +992,13 @@ IF (QT4_QMAKE_FOUND) # macro used to create the names of output files preserving relative dirs MACRO (QT4_MAKE_OUTPUT_FILE infile prefix ext outfile ) - FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile}) + STRING(LENGTH ${CMAKE_CURRENT_BINARY_DIR} _binlength) + STRING(SUBSTRING "${infile}" 0 ${_binlength} _checkinfile) + IF(CMAKE_CURRENT_BINARY_DIR MATCHES "${_checkinfile}") + FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_BINARY_DIR} ${infile}) + ELSE(CMAKE_CURRENT_BINARY_DIR MATCHES "${_checkinfile}") + FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile}) + ENDIF(CMAKE_CURRENT_BINARY_DIR MATCHES "${_checkinfile}") SET(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}") GET_FILENAME_COMPONENT(outpath ${_outfile} PATH) GET_FILENAME_COMPONENT(_outfile ${_outfile} NAME_WE)