diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-02-16 21:50:11 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-02-16 21:50:11 +0000 |
| commit | ea2ead5dd6634cdc05757af0730216b3d7e03232 (patch) | |
| tree | 89b81eac0f122310ecf2b8ad05a55157b1a0c636 /modules/FindQt4.cmake | |
| parent | f66019b20337d3eee65036ca1393f3fe9a8db75b (diff) | |
| download | extra-cmake-modules-ea2ead5dd6634cdc05757af0730216b3d7e03232.tar.gz extra-cmake-modules-ea2ead5dd6634cdc05757af0730216b3d7e03232.tar.bz2 | |
-replace -fexceptions with ${KDE4_ENABLE_EXCEPTIONS} (I'm not sure this is a good name for the variable)
-add install rules for the cmake files in kdelibs/cmake/modules/
-remove debug output and fix typo in FindOpenEXR.cmake
Alex
svn path=/trunk/KDE/kdelibs/; revision=510319
Diffstat (limited to 'modules/FindQt4.cmake')
| -rw-r--r-- | modules/FindQt4.cmake | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 4259b648..fb9dbf35 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -637,16 +637,16 @@ if(QT4_QMAKE_FOUND) # get include dirs QT4_GET_MOC_INC_DIRS(moc_includes) - foreach(it ${ARGN}) + FOREACH(it ${ARGN}) GET_FILENAME_COMPONENT(it ${it} ABSOLUTE) GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) - set(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cxx) + SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cxx) ADD_CUSTOM_COMMAND(OUTPUT ${outfile} COMMAND ${QT_MOC_EXECUTABLE} ARGS ${moc_includes} -o ${outfile} ${it} MAIN_DEPENDENCY ${it}) - set(${outfiles} ${${outfiles}} ${outfile}) + SET(${outfiles} ${${outfiles}} ${outfile}) endforeach(it) ENDMACRO(QT4_WRAP_CPP) @@ -656,16 +656,16 @@ if(QT4_QMAKE_FOUND) MACRO(QT4_WRAP_UI outfiles ) - foreach(it ${ARGN}) + FOREACH(it ${ARGN}) GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) - set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it}) - set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h) + SET(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it}) + SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h) ADD_CUSTOM_COMMAND(OUTPUT ${outfile} COMMAND ${QT_UIC_EXECUTABLE} ARGS -o ${outfile} ${infile} MAIN_DEPENDENCY ${infile}) - set(${outfiles} ${${outfiles}} ${outfile}) - endforeach(it) + SET(${outfiles} ${${outfiles}} ${outfile}) + ENDFOREACH(it) ENDMACRO(QT4_WRAP_UI) @@ -674,16 +674,16 @@ if(QT4_QMAKE_FOUND) MACRO(QT4_ADD_RESOURCES outfiles ) - foreach(it ${ARGN}) + FOREACH(it ${ARGN}) GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE) - set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it}) - set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx) + SET(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it}) + SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx) ADD_CUSTOM_COMMAND(OUTPUT ${outfile} COMMAND ${QT_RCC_EXECUTABLE} ARGS -name ${outfilename} -o ${outfile} ${infile} MAIN_DEPENDENCY ${infile} ) - set(${outfiles} ${${outfiles}} ${outfile}) - endforeach(it) + SET(${outfiles} ${${outfiles}} ${outfile}) + ENDFOREACH(it) ENDMACRO(QT4_ADD_RESOURCES) |