kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: argument names in macros are not real variables, which can lead to problems, which we fixed for KDE in Trysil: http://websvn.kde.org/trunk/KDE/kdelibs/cmake/modules/FindQt4.cmake?rev=557470&r1=557241&r2=557470 

Alex
This commit is contained in:
Alexander Neundorf 2007-01-03 17:00:36 -05:00
parent c8c4b68951
commit c864c8f466
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/FindQt4.cmake
View File

@ -775,17 +775,19 @@ IF (QT4_QMAKE_FOUND)
MACRO (QT4_GENERATE_MOC infile outfile ) MACRO (QT4_GENERATE_MOC infile outfile )
# get include dirs # get include dirs
QT4_GET_MOC_INC_DIRS(moc_includes) QT4_GET_MOC_INC_DIRS(moc_includes)
GET_FILENAME_COMPONENT(infile ${infile} ABSOLUTE) GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile} ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${QT_MOC_EXECUTABLE} COMMAND ${QT_MOC_EXECUTABLE}
ARGS ${moc_includes} -o ${outfile} ${infile} ARGS ${moc_includes} -o ${outfile} ${abs_infile}
DEPENDS ${infile}) DEPENDS ${abs_infile})
MACRO_ADD_FILE_DEPENDENCIES(${infile} ${outfile}) SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # dont run automoc on this file
MACRO_ADD_FILE_DEPENDENCIES(${abs_infile} ${outfile})
ENDMACRO (QT4_GENERATE_MOC) ENDMACRO (QT4_GENERATE_MOC)