diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2011-12-19 22:51:50 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-02 18:00:18 +0100 |
| commit | 5edbf9d9188ecafe2797059aa5600988195cb1c0 (patch) | |
| tree | b04c88f9d9aa95c382e43cc7ab6474ce80763d9f | |
| parent | 54d0ab5b3a2c3f7ae81b2cd90a1ec1026d23fb53 (diff) | |
Convert macros to functions.
Change-Id: I08104d1189ed7d7debcb9f5bd38e8862423ef2c3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| -rw-r--r-- | src/linguist/Qt5LinguistToolsMacros.cmake | 10 | ||||
| -rw-r--r-- | src/qdbus/Qt5DBusToolsMacros.cmake | 19 |
2 files changed, 17 insertions, 12 deletions
diff --git a/src/linguist/Qt5LinguistToolsMacros.cmake b/src/linguist/Qt5LinguistToolsMacros.cmake index 4b9ff9d6f..817069b46 100644 --- a/src/linguist/Qt5LinguistToolsMacros.cmake +++ b/src/linguist/Qt5LinguistToolsMacros.cmake @@ -32,7 +32,7 @@ -macro(QT5_CREATE_TRANSLATION _qm_files) +function(QT5_CREATE_TRANSLATION _qm_files) set(options) set(oneValueArgs) set(multiValueArgs OPTIONS) @@ -76,10 +76,11 @@ macro(QT5_CREATE_TRANSLATION _qm_files) DEPENDS ${_my_sources} ${_ts_pro} VERBATIM) endforeach() qt5_add_translation(${_qm_files} ${_my_tsfiles}) -endmacro() + set(${_qm_files} ${${_qm_files}} PARENT_SCOPE) +endfunction() -macro(QT5_ADD_TRANSLATION _qm_files) +function(QT5_ADD_TRANSLATION _qm_files) foreach(_current_FILE ${ARGN}) get_filename_component(_abs_FILE ${_current_FILE} ABSOLUTE) get_filename_component(qm ${_abs_FILE} NAME_WE) @@ -98,4 +99,5 @@ macro(QT5_ADD_TRANSLATION _qm_files) ) list(APPEND ${_qm_files} ${qm}) endforeach() -endmacro() + set(${_qm_files} ${${_qm_files}} PARENT_SCOPE) +endfunction() diff --git a/src/qdbus/Qt5DBusToolsMacros.cmake b/src/qdbus/Qt5DBusToolsMacros.cmake index 615723970..04468de31 100644 --- a/src/qdbus/Qt5DBusToolsMacros.cmake +++ b/src/qdbus/Qt5DBusToolsMacros.cmake @@ -33,7 +33,7 @@ include(MacroAddFileDependencies) -macro(QT5_ADD_DBUS_INTERFACE _sources _interface _basename) +function(QT5_ADD_DBUS_INTERFACE _sources _interface _basename) get_filename_component(_infile ${_interface} ABSOLUTE) set(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) set(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) @@ -66,10 +66,11 @@ macro(QT5_ADD_DBUS_INTERFACE _sources _interface _basename) list(APPEND ${_sources} ${_impl} ${_header} ${_moc}) macro_add_file_dependencies(${_impl} ${_moc})) -endmacro() + set(${_sources} ${${_sources}} PARENT_SCOPE) +endfunction() -macro(QT5_ADD_DBUS_INTERFACES _sources) +function(QT5_ADD_DBUS_INTERFACES _sources) foreach(_current_FILE ${ARGN}) get_filename_component(_infile ${_current_FILE} ABSOLUTE) # get the part before the ".xml" suffix @@ -77,10 +78,11 @@ macro(QT5_ADD_DBUS_INTERFACES _sources) string(TOLOWER ${_basename} _basename) qt5_add_dbus_interface(${_sources} ${_infile} ${_basename}interface) endforeach() -endmacro() + set(${_sources} ${${_sources}} PARENT_SCOPE) +endfunction() -macro(QT5_GENERATE_DBUS_INTERFACE _header) # _customName OPTIONS -some -options ) +function(QT5_GENERATE_DBUS_INTERFACE _header) # _customName OPTIONS -some -options ) set(options) set(oneValueArgs) set(multiValueArgs OPTIONS) @@ -111,10 +113,10 @@ macro(QT5_GENERATE_DBUS_INTERFACE _header) # _customName OPTIONS -some -options COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${_qt4_dbus_options} ${_in_file} -o ${_target} DEPENDS ${_in_file} VERBATIM ) -endmacro() +endfunction() -macro(QT5_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optionalBasename _optionalClassName) +function(QT5_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optionalBasename _optionalClassName) get_filename_component(_infile ${_xml_file} ABSOLUTE) set(_optionalBasename "${ARGV4}") @@ -147,4 +149,5 @@ macro(QT5_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optional macro_add_file_dependencies(${_impl} ${_moc}) list(APPEND ${_sources} ${_impl} ${_header} ${_moc}) -endmacro() + set(${_sources} ${${_sources}} PARENT_SCOPE) +endfunction() |