1*4882a593SmuzhiyunFrom 87df05c3f83c563af76ab00567e7a1ab7a6ebc88 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Peter Rosin <peda@axentia.se> 3*4882a593SmuzhiyunDate: Sat, 9 Nov 2019 15:42:03 +0100 4*4882a593SmuzhiyunSubject: [PATCH] dbus: avoid 'strange' chars from the build dir in #defines 5*4882a593Smuzhiyun 6*4882a593Smuzhiyungdbus-codegen uses include guards with the full path dir, and if there 7*4882a593Smuzhiyunare "bad" characters, such as '+', this fails miserably. E.g. Yocto has a 8*4882a593Smuzhiyuntendency to build in directories named from the Yocto package version and 9*4882a593Smuzhiyunthat package version containing a '+' are not uncommon, and even the 10*4882a593Smuzhiyunstandard in certain scenarios such as when using ${SRCPV}. 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunAvoid the problem of the full path "leaking" into the source by avoiding 13*4882a593Smuzhiyunthe normal include guards and request "#pragma once" instead. 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSigned-off-by: Peter Rosin <peda@axentia.se> 16*4882a593Smuzhiyun--- 17*4882a593Smuzhiyun dbus/CMakeLists.txt | 12 ++++++------ 18*4882a593Smuzhiyun 1 file changed, 6 insertions(+), 6 deletions(-) 19*4882a593Smuzhiyun 20*4882a593Smuzhiyundiff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt 21*4882a593Smuzhiyunindex f5096ce10ecd..013c32239e12 100644 22*4882a593Smuzhiyun--- a/dbus/CMakeLists.txt 23*4882a593Smuzhiyun+++ b/dbus/CMakeLists.txt 24*4882a593Smuzhiyun@@ -43,37 +43,37 @@ else() 25*4882a593Smuzhiyun endif() 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-adaptater1.c 28*4882a593Smuzhiyun- COMMAND gdbus-codegen --interface-prefix org.bluez.Adapter1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-adaptater1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Adapter1.xml 29*4882a593Smuzhiyun+ COMMAND gdbus-codegen --pragma-once --interface-prefix org.bluez.Adapter1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-adaptater1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Adapter1.xml 30*4882a593Smuzhiyun DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Adapter1.xml 31*4882a593Smuzhiyun COMMENT "Generate D-Bus 'org.bluez.Adapter1.xml'" 32*4882a593Smuzhiyun ) 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-device1.c 35*4882a593Smuzhiyun- COMMAND gdbus-codegen --interface-prefix org.bluez.Device1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-device1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Device1.xml 36*4882a593Smuzhiyun+ COMMAND gdbus-codegen --pragma-once --interface-prefix org.bluez.Device1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-device1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Device1.xml 37*4882a593Smuzhiyun DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Device1.xml 38*4882a593Smuzhiyun COMMENT "Generate D-Bus 'org.bluez.Device1.xml'" 39*4882a593Smuzhiyun ) 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattservice1.c 42*4882a593Smuzhiyun- COMMAND gdbus-codegen --interface-prefix org.bluez.GattService1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattservice1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattService1.xml 43*4882a593Smuzhiyun+ COMMAND gdbus-codegen --pragma-once --interface-prefix org.bluez.GattService1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattservice1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattService1.xml 44*4882a593Smuzhiyun DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattService1.xml 45*4882a593Smuzhiyun COMMENT "Generate D-Bus 'org.bluez.GattService1.xml'" 46*4882a593Smuzhiyun ) 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattcharacteristic1.c 49*4882a593Smuzhiyun- COMMAND gdbus-codegen --interface-prefix org.bluez.Characteristic1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattcharacteristic1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattCharacteristic1.xml 50*4882a593Smuzhiyun+ COMMAND gdbus-codegen --pragma-once --interface-prefix org.bluez.Characteristic1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattcharacteristic1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattCharacteristic1.xml 51*4882a593Smuzhiyun DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattCharacteristic1.xml 52*4882a593Smuzhiyun COMMENT "Generate D-Bus 'org.bluez.GattCharacteristic1.xml'" 53*4882a593Smuzhiyun ) 54*4882a593Smuzhiyun 55*4882a593Smuzhiyun add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattdescriptor1.c 56*4882a593Smuzhiyun- COMMAND gdbus-codegen --interface-prefix org.bluez.Descriptor1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattdescriptor1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattDescriptor1.xml 57*4882a593Smuzhiyun+ COMMAND gdbus-codegen --pragma-once --interface-prefix org.bluez.Descriptor1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattdescriptor1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattDescriptor1.xml 58*4882a593Smuzhiyun DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattDescriptor1.xml 59*4882a593Smuzhiyun COMMENT "Generate D-Bus 'org.bluez.GattDescriptor1.xml'" 60*4882a593Smuzhiyun ) 61*4882a593Smuzhiyun 62*4882a593Smuzhiyun add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-battery1.c 63*4882a593Smuzhiyun- COMMAND gdbus-codegen --interface-prefix org.bluez.Battery1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-battery1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Battery1.xml 64*4882a593Smuzhiyun+ COMMAND gdbus-codegen --pragma-once --interface-prefix org.bluez.Battery1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-battery1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Battery1.xml 65*4882a593Smuzhiyun DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Battery1.xml 66*4882a593Smuzhiyun COMMENT "Generate D-Bus 'org.bluez.Battery1.xml'" 67*4882a593Smuzhiyun ) 68*4882a593Smuzhiyun-- 69*4882a593Smuzhiyun2.11.0 70*4882a593Smuzhiyun 71