diff -r cfb5f62ea048 -r 642f32f76c9d cadMousePro-gui/src/CMakeLists.txt --- a/cadMousePro-gui/src/CMakeLists.txt Tue Sep 03 23:55:00 2019 +0200 +++ b/cadMousePro-gui/src/CMakeLists.txt Wed Sep 04 19:41:21 2019 +0200 @@ -13,8 +13,9 @@ # Generate C++ interface classes from D-Bus XML: file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated-sources/) +set(GENERATED_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/generated-sources/) + set(DBUS_XML ${CMAKE_CURRENT_SOURCE_DIR}/../../d-bus/info.globalcode.mouse.cadMousePro.xml) -set(GENERATED_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/generated-sources/) add_custom_command( DEPENDS ${DBUS_XML} OUTPUT ${GENERATED_SOURCES}/Proxy.h @@ -22,6 +23,16 @@ COMMAND qdbusxml2cpp -p Proxy.h:Proxy.cpp ${DBUS_XML} WORKING_DIRECTORY ${GENERATED_SOURCES} ) + +set(DBUS_XML ${CMAKE_CURRENT_SOURCE_DIR}/../../d-bus/org.freedesktop.UPower.xml) +add_custom_command( + DEPENDS ${DBUS_XML} + OUTPUT ${GENERATED_SOURCES}/UPowerProxy.h + OUTPUT ${GENERATED_SOURCES}/UPowerProxy.cpp + COMMAND qdbusxml2cpp -N -p UPowerProxy.h:UPowerProxy.cpp ${DBUS_XML} + WORKING_DIRECTORY ${GENERATED_SOURCES} +) + cmake_policy(SET CMP0071 NEW) # Let AUTOMOC and AUTOUIC process GENERATED files. # Executable output: @@ -29,6 +40,8 @@ ${EXECUTABLE_FILE} ${CMAKE_CURRENT_BINARY_DIR}/generated-sources/Proxy.h ${CMAKE_CURRENT_BINARY_DIR}/generated-sources/Proxy.cpp + ${CMAKE_CURRENT_BINARY_DIR}/generated-sources/UPowerProxy.h + ${CMAKE_CURRENT_BINARY_DIR}/generated-sources/UPowerProxy.cpp MouseMainWindow.h MouseMainWindow.cpp cadMouseProGUI.cpp