From: Philippe Coval Date: Thu, 27 Feb 2014 12:30:53 +0000 (+0100) Subject: fix: workaround syspopup's header X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fsandbox%2Fpcoval%2Fdevel;p=platform%2Fcore%2Fconnectivity%2Fbt-syspopup.git fix: workaround syspopup's header Change-Id: I2501e7275f9bd04e67028f12c5b066c22e3f0a18 Signed-off-by: Philippe Coval --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a9cbaf..671ecc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,13 @@ ENDIF("${ARCH}" STREQUAL "arm") ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DSLP_DEBUG") +IF(WAYLAND_SUPPORT) + ADD_DEFINITIONS( + "-DHAVE_WAYLAND" + "-DWAYLAND" # used by syspopup + ) +ENDIF(WAYLAND_SUPPORT) + SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie") ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) diff --git a/packaging/org.tizen.bt-syspopup.spec b/packaging/org.tizen.bt-syspopup.spec index 4b1b2bc..2b34668 100644 --- a/packaging/org.tizen.bt-syspopup.spec +++ b/packaging/org.tizen.bt-syspopup.spec @@ -1,3 +1,5 @@ +%bcond_with wayland + %define _optdir /opt %define _usrdir /usr %define _appdir %{_optdir}/apps @@ -45,7 +47,15 @@ bluetooth system-popup application (bluetooth system popup). export CFLAGS+=" -fpie -fvisibility=hidden" export LDFLAGS+=" -Wl,--rpath=/usr/lib -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie" -cmake . -DCMAKE_INSTALL_PREFIX=%{_appdir}/org.tizen.bt-syspopup +cmake . \ + -DCMAKE_INSTALL_PREFIX=%{_appdir}/org.tizen.bt-syspopup \ +%if %{with wayland} + -DWAYLAND_SUPPORT=On \ +%else + -DWAYLAND_SUPPORT=Off \ +%endif + #eol + make %{?jobs:-j%jobs} %install diff --git a/src/bt-syspopup.c b/src/bt-syspopup.c index 0609d90..20ea70c 100644 --- a/src/bt-syspopup.c +++ b/src/bt-syspopup.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "bt-syspopup.h"