AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port to CMakeParseArguments from a custom rolled macro.

Browse Source 
Change-Id: Ia7bf5046420ee8f2d690d098937a212eb75b07ce
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Stephen Kelly 2011-12-05 02:06:21 +01:00 committed by Qt by Nokia
parent db5b3afa01
commit e8f27a71bb
2 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/corelib/Qt5CoreMacros.cmake
View File

@ -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)

26
src/widgets/Qt5WidgetsMacros.cmake
View File

@ -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)