diff options
| author | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2012-04-13 14:01:33 -0300 |
|---|---|---|
| committer | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2012-04-13 14:13:07 -0300 |
| commit | ec2162d96988a773b48861c6bcd19c46bcdf6b23 (patch) | |
| tree | 36f5a24a35736e56457cf6810dbc1bb939e6199b | |
| parent | 37fde05498e2f6df1c3b9b705444f4c7f3025327 (diff) | |
Only generate adaptors for non-deprecated stable interfaces.
| -rw-r--r-- | TelepathyQt/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | cmake/modules/TpQtMacros.cmake | 3 |
2 files changed, 14 insertions, 11 deletions
diff --git a/TelepathyQt/CMakeLists.txt b/TelepathyQt/CMakeLists.txt index 0f1ee2b0..dd06593a 100644 --- a/TelepathyQt/CMakeLists.txt +++ b/TelepathyQt/CMakeLists.txt @@ -877,22 +877,24 @@ if(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT) add_custom_target(all-generated-service-sources) set(SPECS - channel - connection - connection-manager) + svc-channel + svc-connection + svc-connection-manager) foreach(spec ${SPECS}) + tpqt_xincludator(${spec}-spec-xincludator ${CMAKE_CURRENT_SOURCE_DIR}/${spec}.xml ${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-${spec}.xml + DEPENDS stable-typesgen) set(NEW_FILES - ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.h - ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.cpp - ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.moc.hpp) + ${CMAKE_CURRENT_BINARY_DIR}/_gen/${spec}.h + ${CMAKE_CURRENT_BINARY_DIR}/_gen/${spec}.cpp + ${CMAKE_CURRENT_BINARY_DIR}/_gen/${spec}.moc.hpp) list(APPEND telepathy_qt_service_SRCS ${NEW_FILES}) - list(APPEND telepathy_qt_service_generated_specs_mocs "moc-svc-${spec}.moc.hpp") + list(APPEND telepathy_qt_service_generated_specs_mocs "moc-${spec}.moc.hpp") set_source_files_properties(${NEW_FILES} PROPERTIES GENERATED true) endforeach(spec ${SPECS}) - tpqt_service_generator(channel servicechannel Channel Tp::Service DEPENDS channel-spec-xincludator) - tpqt_service_generator(connection serviceconn Connection Tp::Service DEPENDS connection-spec-xincludator) - tpqt_service_generator(connection-manager servicecm ConnectionManager Tp::Service DEPENDS connection-manager-spec-xincludator) + tpqt_service_generator(svc-channel servicechannel Channel Tp::Service DEPENDS svc-channel-spec-xincludator) + tpqt_service_generator(svc-connection serviceconn Connection Tp::Service DEPENDS svc-connection-spec-xincludator) + tpqt_service_generator(svc-connection-manager servicecm ConnectionManager Tp::Service DEPENDS svc-connection-manager-spec-xincludator) if (TARGET doxygen-doc) add_dependencies(doxygen-doc all-generated-service-sources) diff --git a/cmake/modules/TpQtMacros.cmake b/cmake/modules/TpQtMacros.cmake index 83133ee2..38f4af6a 100644 --- a/cmake/modules/TpQtMacros.cmake +++ b/cmake/modules/TpQtMacros.cmake @@ -274,6 +274,7 @@ endfunction(tpqt_future_client_generator spec namespace) function(tpqt_service_generator spec group pretty_include namespace) tpqt_extract_depends(service_generator_args service_generator_depends ${ARGN}) + string(REPLACE "svc-" "" spec ${spec}) set(ARGS ${CMAKE_SOURCE_DIR}/tools/qt-svc-gen.py --group=${group} @@ -284,7 +285,7 @@ function(tpqt_service_generator spec group pretty_include namespace) --realinclude=TelepathyQt/_gen/svc-${spec}.h --mocinclude=TelepathyQt/_gen/svc-${spec}.moc.hpp --specxml=${CMAKE_CURRENT_BINARY_DIR}/_gen/stable-spec.xml - --ifacexml=${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-${spec}.xml + --ifacexml=${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-svc-${spec}.xml --visibility=TP_QT_EXPORT ${service_generator_args}) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.cpp |