[Tizen-submit] 16250: Changes to Tizen:Mobile/osp-security-service

noreply at tizen.org noreply at tizen.org
Mon Oct 21 14:00:04 GMT 2013


Hi,
Michael Leibowitz have made the following changes to osp-security-service in project Tizen:Mobile. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #16250

  submit:       Tizen:Mobile:build/osp-security-service(cleanup) -> Tizen:Mobile


Message:
Submitter: Michael Leibowitz <michael.leibowitz at intel.com>
Comments: fixes a build break
Git project: platform/framework/native/security-service
Tag: submit/tizen/20131021.140241
Commit: 3afe0cbec1670fbc5b8c1507bb282b959a358467 Fix CMake script to use pkgconfig.

State:   new        2013-10-21T13:58:02 tizenrobot
Comment: <no comment>
spec files:
-----------
--- osp-security-service.spec
+++ osp-security-service.spec
@@ -1,10 +1,10 @@
 Name:		osp-security-service
-Summary:	osp security service
+Summary:	OSP security service
 Version:	1.2.2.0
 Release:	1
-VCS:     platform/framework/native/security-service#submit/tizen/20131005.083404-0-ga63751449586c338a9a3976a1bbe50bd1c48ccda
-Group:		TO_BE/FILLED_IN
-License:	TO_BE/FILLED_IN
+VCS:     platform/framework/native/security-service#submit/tizen/20131021.140241-0-g3afe0cbec1670fbc5b8c1507bb282b959a358467
+Group:		Security/Service
+License:	Apache-2.0
 Source0:	%{name}-%{version}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(chromium)
@@ -17,7 +17,7 @@
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(vconf-internal-keys)
 
-BuildRequires:  osp-appfw-internal-devel
+BuildRequires:  pkgconfig(osp-appfw-server)
 BuildRequires:  hash-signer
 
 # smack domain requires

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

++++++ osp-security-service-1.2.2.0.tar.gz
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -3,21 +3,24 @@
 SET (this_target osp-security-service)
 SET (APPID q7097a278m)
 
+INCLUDE(FindPkgConfig)
+pkg_check_modules(${this_target} REQUIRED
+	chromium
+	capi-system-media-key
+	capi-network-bluetooth
+	pkgmgr
+	glib-2.0
+	osp-appfw
+	vconf
+	vconf-internal-keys
+	osp-appfw-server
+	)
+
 SET(CMAKE_EXECUTABLE_SUFFIX ".exe")
 SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/output")
 
 INCLUDE_DIRECTORIES (
-	/usr/include/glib-2.0
-	/usr/lib/glib-2.0/include
-	/usr/include/osp
-	/usr/include/osp/app
-	/usr/include/osp/base
-	/usr/include/osp/io
-	/usr/include/chromium
-	/usr/include/osp/security
-	/usr/include/osp/server
-	/usr/include
-	/usr/include/vconf
+	${${this_target}_INCLUDE_DIRS}
 	inc
 	)
 
@@ -52,13 +55,10 @@
 ## Create Library
 ADD_EXECUTABLE (${this_target} ${${this_target}_SOURCE_FILES})
 
-TARGET_LINK_LIBRARIES(${this_target} -Xlinker --no-undefined -Xlinker --as-needed -pie)
-TARGET_LINK_LIBRARIES(${this_target} -Xlinker --version-script=${CMAKE_CURRENT_SOURCE_DIR}/system-service-export.ver)
-TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -lchromium)
-TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp-server -losp-appfw-server")
-TARGET_LINK_LIBRARIES(${this_target} "-lvconf" )
 TARGET_LINK_LIBRARIES(${this_target} "-ldl" )
 
+TARGET_LINK_LIBRARIES(${this_target} ${${this_target}_LDFLAGS} ${${this_target}_LIBRARIES})
+
 ## Cory additional info
 INSTALL(TARGETS ${this_target} DESTINATION ../usr/apps/${APPID}/bin)

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


More information about the Tizen-submit mailing list