Fix build wrt-installer in pure wayland

Change-Id: I432b25182b44c37386ffac14968c7beb63f57882
Signed-off-by: Jean-Benoit MARTIN <jean-benoit.martin@open.eurogiciel.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d7bcda..1bff1a0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,9 @@ OPTION(CSP_SUPPORT "Support for csp policy" ON)
 OPTION(ALLOW_NAVIGATION_SUPPORT "Support for allow-navigation" ON)
 OPTION(SMACK "Enable smack support" ON)
 OPTION(DECRYPT_SUPPORT "Enable appmanager capabilities" ON)
+OPTION(X11_SUPPORT "Enable X11" ON)
+OPTION(WAYLAND_SUPPORT "Enable Wayland" OFF)
+
 IF(DECRYPT_SUPPORT)
     ADD_DEFINITIONS("-DDECRYPT")
 ENDIF(DECRYPT_SUPPORT)

diff --git a/packaging/wrt-installer.spec b/packaging/wrt-installer.spec
index d35b77a..f025c54 100644 (file)
--- a/packaging/wrt-installer.spec
+++ b/packaging/wrt-installer.spec
@@ -1,6 +1,9 @@
 %bcond_with livebox
 %bcond_with decrypt
 %bcond_with osp
+%bcond_with wayland
+%bcond_with x
+
 Name:       wrt-installer
 Summary:    Installer for tizen Webruntime
 Version:    0.1.138
@@ -23,7 +26,12 @@ BuildRequires:  pkgconfig(dpl-wrt-dao-rw)
 BuildRequires:  pkgconfig(wrt-commons-i18n-dao-ro)
 BuildRequires:  pkgconfig(wrt-commons-widget-interface-dao)
 BuildRequires:  pkgconfig(security-install)
+%if %{with x}
 BuildRequires:  pkgconfig(ecore-x)
+%endif
+%if %{with wayland}
+BuildRequires:  pkgconfig(ecore-wayland)
+%endif
 BuildRequires:  pkgconfig(xmlsec1)
 BuildRequires:  pkgconfig(libidn)
 BuildRequires:  pkgconfig(libiri)
@@ -35,7 +43,6 @@ BuildRequires:  pkgconfig(pkgmgr-info)
 BuildRequires:  pkgconfig(pkgmgr)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(cert-svc)
-BuildRequires:  pkgconfig(utilX)
 BuildRequires:  pkgconfig(wrt-plugins-types)
 BuildRequires:  pkgconfig(tapi)
 BuildRequires:  pkgconfig(shortcut)
@@ -93,6 +100,16 @@ LDFLAGS="$LDFLAGS"
 %else
          -DDECRYPT_SUPPORT=Off \
 %endif
+%if %{with wayland}
+         -DWAYLAND_SUPPORT=On \
+%else
+         -DWAYLAND_SUPPORT=Off \
+%endif
+%if %{with x}
+         -DX11_SUPPORT=On \
+%else
+         -DX11_SUPPORT=Off \
+%endif
         -DSYSCONFDIR=%{_sysconfdir} \
         -DSMACK=Off \
         -DDPL_LOG=ON \

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9c69f7b..d9805eb 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -157,6 +157,7 @@ PKG_CHECK_MODULES(web-provider)
 ADD_DEFINITIONS("-DLIVEBOX")
 ENDIF(LIVEBOX_SUPPORT)
 
+IF(X11_SUPPORT)
 PKG_CHECK_MODULES(SYS_INSTALLER_STATIC_DEP
     appsvc
     libxml-2.0
@@ -177,6 +178,28 @@ PKG_CHECK_MODULES(SYS_INSTALLER_STATIC_DEP
     libprivilege-control
     REQUIRED
 )
+ELSE(WAYLAND_SUPPORT)
+PKG_CHECK_MODULES(SYS_INSTALLER_STATIC_DEP
+    appsvc
+    libxml-2.0
+    openssl
+    cert-svc-vcore
+    security-install
+    ecore-wayland
+    xmlsec1
+    libidn
+    libiri
+    libpcrecpp
+    ail
+    elementary
+    tapi
+    shortcut
+    capi-appfw-app-manager
+    app2sd
+    libprivilege-control
+    REQUIRED
+)
+ENDIF(X11_SUPPORT)
 
 INCLUDE_DIRECTORIES( SYSTEM ${SYS_INSTALLER_STATIC_DEP_INCLUDE_DIRS})