diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-06-19 09:47:56 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-06-19 09:47:56 +0200 |
| commit | f2349f53f00c74a7fe648f5037a8cc76cdb162b9 (patch) | |
| tree | d236d89dceb0a549fa52e7941079783e2e062960 /cpp/src | |
| parent | Add back iceboxadmin Debug, disable IceBridge/Debug tests on Windows (diff) | |
| download | ice-f2349f53f00c74a7fe648f5037a8cc76cdb162b9.tar.bz2 ice-f2349f53f00c74a7fe648f5037a8cc76cdb162b9.tar.xz ice-f2349f53f00c74a7fe648f5037a8cc76cdb162b9.zip | |
Fixed ICE-8094 & ICE-8099 - IceBT build system fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceBT/Makefile.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/src/IceBT/Makefile.mk b/cpp/src/IceBT/Makefile.mk index 33bd7c56ed2..9c7a18240ef 100644 --- a/cpp/src/IceBT/Makefile.mk +++ b/cpp/src/IceBT/Makefile.mk @@ -9,13 +9,20 @@ ifneq ($(filter debian ubuntu yocto,$(linux_id)),) +# +# Only build the IceBT plugin if pkg-config, BlueZ and D-Bus requirements are +# installed. +# +ifeq ($(shell pkg-config --exists bluez dbus-1 2> /dev/null && echo yes),yes) $(project)_libraries := IceBT IceBT_targetdir := $(libdir) IceBT_dependencies := Ice IceBT_cppflags := -DICEBT_API_EXPORTS $(shell pkg-config --cflags dbus-1) IceBT_sliceflags := --include-dir IceBT +IceBT_system_libs = $(IceSSL_system_libs) $(shell pkg-config --libs dbus-1) projects += $(project) +endif endif |