diff options
author | Ronan Le Martret <ronan@fridu.net> | 2014-02-18 13:25:26 +0100 |
---|---|---|
committer | ronan(Eurogiciel) Le Martret <ronan.lemartret@open.eurogiciel.org> | 2014-04-02 00:03:07 -0700 |
commit | 44475a50f5322f5ee5417a0fc1cc73ed2062fbc1 (patch) | |
tree | b195d923fe6f9ceb4eb53692d78952ebd85ce3dc | |
parent | f28b3340832b7f343ae30e45540eace26b12f336 (diff) | |
download | ug-setting-location-efl-accepted/tizen/generic/20140408.111757.tar.gz ug-setting-location-efl-accepted/tizen/generic/20140408.111757.tar.bz2 ug-setting-location-efl-accepted/tizen/generic/20140408.111757.zip |
Fix ug-setting-location-efl build into pure Wayland profile.HEADsubmit/tizen/20140408.111512accepted/tizen/ivi/panda/20140408.203041accepted/tizen/ivi/20140409.182451accepted/tizen/generic/20140408.111757tizenaccepted/tizen_ivi_pandaaccepted/tizen_iviaccepted/tizen_genericaccepted/tizen_common
Change-Id: I434bcd0485a016a378ba93c0d115ffa10b47068c
Signed-off-by: Ronan Le Martret <ronan@fridu.net>
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | packaging/ug-setting-location-efl.spec | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ebd216..72691f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,10 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DEDJDIR=\"${EDJDIR}\"") ADD_DEFINITIONS("-DLANGDIR=\"${LANGDIR}\"") +IF(WAYLAND_SUPPORT) + ADD_DEFINITIONS("-DWAYLAND") +ENDIF(WAYLAND_SUPPORT) + ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.1.0) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS}) diff --git a/packaging/ug-setting-location-efl.spec b/packaging/ug-setting-location-efl.spec index 48755ac..aff1381 100644 --- a/packaging/ug-setting-location-efl.spec +++ b/packaging/ug-setting-location-efl.spec @@ -1,3 +1,5 @@ +%bcond_with wayland + Name: ug-setting-location-efl Summary: UG setting location EFL Version: 0.3.46 @@ -15,7 +17,7 @@ BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(capi-location-manager) BuildRequires: edje-bin BuildRequires: cmake -BuildRequires: gettext-tools +BuildRequires: gettext-tools Requires(post): /sbin/ldconfig Requires(post): /usr/bin/vconftool requires(postun): /sbin/ldconfig @@ -29,7 +31,12 @@ cp %{SOURCE1001} . %build export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed -Wl,--hash-style=both" -LDFLAGS="$LDFLAGS" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +LDFLAGS="$LDFLAGS" %cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \ +%if %{with wayland} + -DWAYLAND_SUPPORT=On +%else + -DWAYLAND_SUPPORT=Off +%endif make %{?jobs:-j%jobs} @@ -37,7 +44,7 @@ make %{?jobs:-j%jobs} %make_install -%post +%post /sbin/ldconfig mkdir -p /usr/ug/bin/ mkdir -p /usr/ug/res/locale/ |