diff options
| author | Li,Limin <liminx.li@intel.com> | 2014-01-08 18:01:31 +0800 |
|---|---|---|
| committer | Li,Limin <liminx.li@intel.com> | 2014-01-08 18:03:38 +0800 |
| commit | 3a86573c836fcbe7cb6072e5607b4216c6c5c133 (patch) | |
| tree | fb2b812369b88727e6c8d2365f3a4f0d831bcbb0 /ug-efl-engine | |
| parent | bc0915cd3c899263c1be54730be7df3ecb9b54dd (diff) | |
| download | ui-gadget-1-3a86573c836fcbe7cb6072e5607b4216c6c5c133.tar.gz ui-gadget-1-3a86573c836fcbe7cb6072e5607b4216c6c5c133.tar.bz2 ui-gadget-1-3a86573c836fcbe7cb6072e5607b4216c6c5c133.zip | |
init wayland supportsubmit/tizen/20140110.215645accepted/tizen/mobile/20140113.182040accepted/tizen/ivi/20140110.224049accepted/tizen/generic/20140114.145758accepted/tizen/mobile
The display server based on X or Wayland, is now a choice of different profile in Tizen 3.0.
Basically and consistently, two macros were used "with wayland" and "with x".
Below summarize the combination of the macros:
| wayland | x | meaning
|---------------------------
| 0 | 1 | pure X11 platform(no wayland)
| 1 | 0 | pure wayland platform (no X11)
| 1 | 1 | wayland but X compatibility
| 0 | 0 | no X and no wayland
This method unifies the meaning and usage. Deploy this method to ui-gadget package.
Signed-off-by: Li,Limin <liminx.li@intel.com>
Change-Id: Iceb95b03f824860b2aac74f35c0945380f6cc22a
Diffstat (limited to 'ug-efl-engine')
| -rw-r--r--[-rwxr-xr-x] | ug-efl-engine/CMakeLists.txt | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/ug-efl-engine/CMakeLists.txt b/ug-efl-engine/CMakeLists.txt index d498e2d..6005fa5 100755..100644 --- a/ug-efl-engine/CMakeLists.txt +++ b/ug-efl-engine/CMakeLists.txt @@ -3,15 +3,18 @@ SET(UG_EFL_ENGINE_SRCS ug-efl-engine.c) SET(UG_ENGINE_EDJ_DIR "${CMAKE_INSTALL_PREFIX}/share/edje") SET(VERSION_MAJOR 0) SET(VERSION "${VERSION_MAJOR}.1.0") +SET(UG_EFL_ENGINE_PKGS_CHECK_MODULES "dlog elementary ecore edje capi-appfw-application evas") -PKG_CHECK_MODULES(UG_EFL_ENGINE_PKGS REQUIRED - dlog - elementary - ecore - ecore-x - edje - capi-appfw-application - evas) +IF (with_x) + PKG_CHECK_MODULES(UG_EFL_ENGINE_PKGS REQUIRED + ${UG_EFL_ENGINE_PKGS_CHECK_MODULES} + ecore-x) +ENDIF(with_x) + +IF (with_wayland) + PKG_CHECK_MODULES(UG_EFL_ENGINE_PKGS REQUIRED + ${UG_EFL_ENGINE_PKGS_CHECK_MODULES}) +ENDIF(with_wayland) FOREACH(flag ${UG_EFL_ENGINE_PKGS_CFLAGS}) SET(UG_EFL_ENGINE_CFLAGS "${UG_EFL_ENGINE_CFLAGS} ${flag}") |