diff options
| author | Volker Krause <vkrause@kde.org> | 2006-06-17 09:16:29 +0000 |
|---|---|---|
| committer | Volker Krause <vkrause@kde.org> | 2006-06-17 09:16:29 +0000 |
| commit | d1502894bdccc2e40ea81aadede9040899c514bb (patch) | |
| tree | 3d970e68bb05b20a0e33befe3160ae55e92bbfa3 | |
| parent | 918653165c029d8b2aaff79ecbcb6bdc74afc8e8 (diff) | |
| download | extra-cmake-modules-d1502894bdccc2e40ea81aadede9040899c514bb.tar.gz extra-cmake-modules-d1502894bdccc2e40ea81aadede9040899c514bb.tar.bz2 | |
Handle org.foo.Bar.xml correctly, ie. generate barinterface.h/.cpp.
svn path=/trunk/KDE/kdelibs/; revision=552266
| -rw-r--r-- | modules/QtDBusMacros.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/QtDBusMacros.cmake b/modules/QtDBusMacros.cmake index f279f1c4..b7f00f12 100644 --- a/modules/QtDBusMacros.cmake +++ b/modules/QtDBusMacros.cmake @@ -5,12 +5,13 @@ macro(qdbus_add_interfaces _sources) foreach (_i ${ARGN}) get_filename_component(_xml_file ${_i} ABSOLUTE) - get_filename_component(_basename ${_i} NAME_WE) - set(_target_base ${CMAKE_CURRENT_BINARY_DIR}/${_basename}) + string(REGEX REPLACE ".*\\.([^\\.]+)\\.xml$" "\\1" _basename ${_i}) + string(TOLOWER ${_basename} _basename) + set(_target_base ${CMAKE_CURRENT_BINARY_DIR}/${_basename}interface) add_custom_command(OUTPUT ${_target_base}.cpp ${_target_base}.h COMMAND ${QDBUS_IDL2CPP_EXECUTABLE} - ARGS -m -p ${_basename} ${_xml_file} + ARGS -m -p ${_target_base} ${_xml_file} DEPENDS ${_xml_file} ) @@ -37,7 +38,8 @@ endmacro(qdbus_generate_interface) macro(qdbus_add_adaptors _sources) foreach (_i ${ARGN}) get_filename_component(_xml_file ${_i} ABSOLUTE) - get_filename_component(_basename ${_i} NAME_WE) + string(REGEX REPLACE ".*\\.([^\\.]+)\\.xml$" "\\1" _basename ${_i}) + string(TOLOWER ${_basename} _basename) set(_target_base ${CMAKE_CURRENT_BINARY_DIR}/${_basename}adaptor) add_custom_command(OUTPUT ${_target_base}.cpp ${_target_base}.h |