[Tizen-submit] 21762: Changes to Tizen:IVI/capi-ui-efl-util

noreply at tizen.org noreply at tizen.org
Fri Feb 28 10:24:34 GMT 2014


Hi,
Ronan Le Martret have made the following changes to capi-ui-efl-util in project Tizen:IVI. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #21762

  submit:       Tizen:IVI:build/capi-ui-efl-util(cleanup) -> Tizen:IVI


Message:
Submitter: Ronan Le Martret <ronan at fridu.net>
Comments: Add conditional build stuff
Git project: platform/core/api/efl-util
Tag: submit/tizen/20140228.102406
Commit: 12d91efbabbf6f43c272630e9a3f4b1e2e5d9533 Add conditional build stuff

State:   new        2014-02-28T10:24:13 tizenrobot
Comment: <no comment>
changes files:
--------------

spec files:
-----------
--- capi-ui-efl-util.spec
+++ capi-ui-efl-util.spec
@@ -1,16 +1,19 @@
+%bcond_with x
 Name:       capi-ui-efl-util
+VCS:        platform/core/api/efl-util#12d91efbabbf6f43c272630e9a3f4b1e2e5d9533
 Summary:    An EFL utility library in SLP C API
 Version:    0.1.0
 Release:    1
-VCS:        platform/core/api/efl-util#accepted/tizen/20130912.093115-0-gcf11e73b24b0ba86ea8b0991e042bc7a76bb7b04
 Group:      Graphics & UI Framework/API
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1001: 	capi-ui-efl-util.manifest
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
+%if %{with x}
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(utilX)
+%endif
 BuildRequires:  pkgconfig(elementary)
 BuildRequires:  pkgconfig(capi-base-common)
 

other changes:
--------------

++++++ capi-ui-efl-util-0.1.0.tar.gz
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -10,7 +10,8 @@
 SET(INC_DIR include)
 INCLUDE_DIRECTORIES(${INC_DIR})
 
-SET(dependents "dlog utilX elementary capi-base-common")
+# required dependencies
+SET(dependents "dlog elementary capi-base-common")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(${fw_name} REQUIRED ${dependents})
@@ -18,6 +19,20 @@
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
+# optional
+SET(ECORE_X "ecore-x utilX")
+pkg_check_modules(ECORE_X ${ECORE_X})
+FOREACH(flag ${${ECORE_X}_CFLAGS})
+    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+IF (ECORE_X_FOUND)
+   SET(HAVE_X "1")
+   SET(deps "${deps} ecore-x utilX")
+ELSE (ECORE_X_FOUND)
+   SET(HAVE_X "0")
+ENDIF (ECORE_X_FOUND)
+
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 
@@ -60,6 +75,13 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc
     @ONLY
 )
+
+CONFIGURE_FILE(
+    config.h.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/config.h
+    @ONLY
+)
+
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 IF(UNIX)
--- capi-ui-efl-util.pc.in
+++ capi-ui-efl-util.pc.in
@@ -9,7 +9,7 @@
 Name: @PC_NAME@
 Description: @PACKAGE_DESCRIPTION@
 Version: @VERSION@

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list