diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2010-03-17 22:33:03 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2010-03-17 22:33:03 (GMT) |
| commit | 108090fde96916ba666f035d1e260f036af5b31e (patch) | |
| tree | 301baee62cce753cdd09bc3a1520ef484904945f | |
| parent | 61ad5242b7bf56ae9e9b6fc704d0228a9fa2d620 (diff) | |
| download | CMake-108090fde96916ba666f035d1e260f036af5b31e.zip CMake-108090fde96916ba666f035d1e260f036af5b31e.tar.gz CMake-108090fde96916ba666f035d1e260f036af5b31e.tar.bz2 | |
Include relative path in generated qrc and uic files. Fixes #10413.
| -rw-r--r-- | Modules/Qt4Macros.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake index bd72c8f..fc26c06 100644 --- a/Modules/Qt4Macros.cmake +++ b/Modules/Qt4Macros.cmake @@ -159,7 +159,7 @@ MACRO (QT4_WRAP_UI outfiles ) FOREACH (it ${ui_files}) GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) - SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h) + QT4_MAKE_OUTPUT_FILE(${infile} ui_ h outfile) ADD_CUSTOM_COMMAND(OUTPUT ${outfile} COMMAND ${QT_UIC_EXECUTABLE} ARGS ${ui_options} -o ${outfile} ${infile} @@ -179,7 +179,7 @@ MACRO (QT4_ADD_RESOURCES outfiles ) GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE) GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) GET_FILENAME_COMPONENT(rc_path ${infile} PATH) - SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx) + QT4_MAKE_OUTPUT_FILE(${infile} qrc_ cxx outfile) # parse file for dependencies # all files are absolute paths or relative to the location of the qrc file FILE(READ "${infile}" _RC_FILE_CONTENTS) |