From 140c4f18f5a998e12e45daaf063bf430eea35c84 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 18 Feb 2014 13:16:05 +0100 Subject: [PATCH 1/1] Fix ug-setting-homescreen-efl build into pure Wayland profile. Change-Id: Ib0d20eced46e1e15774cd81ac2bd89e6ae98e638 Signed-off-by: Ronan Le Martret --- CMakeLists.txt | 4 ++++ packaging/ug-setting-homescreen-efl.spec | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f00a68..982d737 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,10 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}") ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") +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-homescreen-efl.spec b/packaging/ug-setting-homescreen-efl.spec index 0def9c4..d08bea3 100755 --- a/packaging/ug-setting-homescreen-efl.spec +++ b/packaging/ug-setting-homescreen-efl.spec @@ -1,4 +1,5 @@ %bcond_with x +%bcond_with wayland Name: ug-setting-homescreen-efl Summary: UI Gadget : setting-homescreen-efl @@ -36,7 +37,12 @@ cp %{SOURCE1001} . %build -cmake . -DCMAKE_INSTALL_PREFIX=%{/usr/ug/lib}/ +%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}/ug/lib/ \ +%if %{with wayland} + -DWAYLAND_SUPPORT=On +%else + -DWAYLAND_SUPPORT=Off +%endif make %{?jobs:-j%jobs} @@ -49,6 +55,6 @@ rm -rf %{buildroot} %files %manifest %{name}.manifest -/etc/smack/accesses2.d/ug.setting-homescreen-efl.include -/usr/ug/lib/* -/usr/ug/res/* +%{_sysconfdir}/smack/accesses2.d/ug.setting-homescreen-efl.include +%{_prefix}/ug/lib/* +%{_prefix}/ug/res/* -- 2.7.4