diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2011-12-05 02:06:21 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-06 16:57:16 +0100 |
| commit | e8f27a71bb96b0126539bc8ed29edb37254fa5ff (patch) | |
| tree | ec614be50229e235fd2ce1c95674e102c1a04519 | |
| parent | db5b3afa0123bedb25ffef11bf6347f9c63caae9 (diff) | |
Port to CMakeParseArguments from a custom rolled macro.
Change-Id: Ia7bf5046420ee8f2d690d098937a212eb75b07ce
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| -rw-r--r-- | src/corelib/Qt5CoreMacros.cmake | 37 | ||||
| -rw-r--r-- | src/widgets/Qt5WidgetsMacros.cmake | 26 |
2 files changed, 27 insertions, 36 deletions
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake index 1da0822960..96f878f2b1 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -36,23 +36,7 @@ # ###################################### -MACRO (QT5_EXTRACT_OPTIONS _qt5_files _qt5_options) - SET(${_qt5_files}) - SET(${_qt5_options}) - SET(_QT5_DOING_OPTIONS FALSE) - FOREACH(_currentArg ${ARGN}) - IF ("${_currentArg}" STREQUAL "OPTIONS") - SET(_QT5_DOING_OPTIONS TRUE) - ELSE ("${_currentArg}" STREQUAL "OPTIONS") - IF(_QT5_DOING_OPTIONS) - LIST(APPEND ${_qt5_options} "${_currentArg}") - ELSE(_QT5_DOING_OPTIONS) - LIST(APPEND ${_qt5_files} "${_currentArg}") - ENDIF(_QT5_DOING_OPTIONS) - ENDIF ("${_currentArg}" STREQUAL "OPTIONS") - ENDFOREACH(_currentArg) -ENDMACRO (QT5_EXTRACT_OPTIONS) - +include(CMakeParseArguments) # macro used to create the names of output files preserving relative dirs MACRO (QT5_MAKE_OUTPUT_FILE infile prefix ext outfile ) @@ -156,8 +140,15 @@ ENDMACRO (QT5_GENERATE_MOC) MACRO (QT5_WRAP_CPP outfiles ) # get include dirs QT5_GET_MOC_FLAGS(moc_flags) - QT5_EXTRACT_OPTIONS(moc_files moc_options ${ARGN}) + set(options) + set(oneValueArgs) + set(multiValueArgs OPTIONS) + + cmake_parse_arguments(_WRAP_CPP "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + + set(moc_files ${_WRAP_CPP_UNPARSED_ARGUMENTS}) + set(moc_options ${_WRAP_CPP_OPTIONS}) FOREACH (it ${moc_files}) GET_FILENAME_COMPONENT(it ${it} ABSOLUTE) QT5_MAKE_OUTPUT_FILE(${it} moc_ cxx outfile) @@ -171,7 +162,15 @@ ENDMACRO (QT5_WRAP_CPP) # QT5_ADD_RESOURCES(outfiles inputfile ... ) MACRO (QT5_ADD_RESOURCES outfiles ) - QT5_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN}) + + set(options) + set(oneValueArgs) + set(multiValueArgs OPTIONS) + + cmake_parse_arguments(_RCC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + + set(rcc_files ${_RCC_UNPARSED_ARGUMENTS}) + set(rcc_options ${_RCC_OPTIONS}) FOREACH (it ${rcc_files}) GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE) diff --git a/src/widgets/Qt5WidgetsMacros.cmake b/src/widgets/Qt5WidgetsMacros.cmake index 2da068eddb..836656f705 100644 --- a/src/widgets/Qt5WidgetsMacros.cmake +++ b/src/widgets/Qt5WidgetsMacros.cmake @@ -36,28 +36,20 @@ # ###################################### -MACRO (QT5_EXTRACT_OPTIONS _qt5_files _qt5_options) - SET(${_qt5_files}) - SET(${_qt5_options}) - SET(_QT5_DOING_OPTIONS FALSE) - FOREACH(_currentArg ${ARGN}) - IF ("${_currentArg}" STREQUAL "OPTIONS") - SET(_QT5_DOING_OPTIONS TRUE) - ELSE ("${_currentArg}" STREQUAL "OPTIONS") - IF(_QT5_DOING_OPTIONS) - LIST(APPEND ${_qt5_options} "${_currentArg}") - ELSE(_QT5_DOING_OPTIONS) - LIST(APPEND ${_qt5_files} "${_currentArg}") - ENDIF(_QT5_DOING_OPTIONS) - ENDIF ("${_currentArg}" STREQUAL "OPTIONS") - ENDFOREACH(_currentArg) -ENDMACRO (QT5_EXTRACT_OPTIONS) +include(CMakeParseArguments) # QT5_WRAP_UI(outfiles inputfile ... ) MACRO (QT5_WRAP_UI outfiles ) - QT5_EXTRACT_OPTIONS(ui_files ui_options ${ARGN}) + set(options) + set(oneValueArgs) + set(multiValueArgs OPTIONS) + + cmake_parse_arguments(_WRAP_UI "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + + set(ui_files ${_WRAP_UI_UNPARSED_ARGUMENTS}) + set(ui_options ${_WRAP_UI_OPTIONS}) FOREACH (it ${ui_files}) GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) |