[Tizen-submit] 16272: Changes to Tizen:Mobile/osp-nfc

noreply at tizen.org noreply at tizen.org
Tue Oct 22 03:46:22 GMT 2013


Hi,
Arron Wang have made the following changes to osp-nfc in project Tizen:Mobile. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #16272

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


Message:
Submitter: Arron Wang <arron.wang at intel.com>
Comments: Fix CMake script to use pkgconfig
Git project: platform/framework/native/nfc
Tag: submit/tizen/20131022.034736
Commit: 185e695159b72f5ea4a9c8d6a5bd95299b8f213e Fix CMake script to use pkgconfig.

State:   new        2013-10-22T03:47:50 tizenrobot
Comment: <no comment>
spec files:
-----------
--- osp-nfc.spec
+++ osp-nfc.spec
@@ -2,7 +2,7 @@
 Summary:	osp nfc library
 Version:	1.2.1.0
 Release:	2
-VCS:     platform/framework/native/nfc#submit/tizen/20130912.090458-0-gf331b4d5f2b6bb7983204896d937431fb3b9c820
+VCS:     platform/framework/native/nfc#submit/tizen/20131022.034736-0-g185e695159b72f5ea4a9c8d6a5bd95299b8f213e
 Group:		System/Libraries
 License:	TO_BE/FILLED_IN
 Source0:	%{name}-%{version}.tar.gz

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

++++++ osp-nfc-1.2.1.0.tar.gz
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -2,24 +2,16 @@
 
 SET (this_target osp-nfc)
 
+INCLUDE(FindPkgConfig)
+pkg_check_modules(${this_target} REQUIRED glib-2.0 capi-network-nfc osp-net osp-appfw chromium)
+
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/cmake_build_tmp/output)
 
 INCLUDE_DIRECTORIES(
   inc
 	src
 	src/inc
-	/usr/include/chromium
-	/usr/include/glib-2.0
-	/usr/lib/glib-2.0/include
-	/usr/include/system
-	/usr/include/network
-	/usr/include/osp
-	/usr/include/osp/app
-	/usr/include/osp/base
-	/usr/include/osp/io
-	/usr/include/osp/net
-	/usr/include/osp/security
-	/usr/include/osp/system
+	${${this_target}_INCLUDE_DIRS}
     )
 
 SET (${this_target}_SOURCE_FILES
@@ -72,11 +64,10 @@
 ## SET LINKER FLAGS
 SET(CMAKE_SHARED_LINKER_FLAGS -Wl,--no-undefined)
 
-TARGET_LINK_LIBRARIES(${this_target} "-lchromium" )
-TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-appfw -losp-net" )
-TARGET_LINK_LIBRARIES(${this_target} "-lcapi-network-nfc" )
 TARGET_LINK_LIBRARIES(${this_target} "-lpthread" )
 
+TARGET_LINK_LIBRARIES(${this_target} ${${this_target}_LDFLAGS} ${${this_target}_LIBRARIES})
+
 SET_TARGET_PROPERTIES(${this_target}
 	PROPERTIES
 	VERSION ${FULLVER}
@@ -94,5 +85,6 @@
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/inc/ DESTINATION include/osp/net FILES_MATCHING PATTERN "*.h")
 
 # pkgconfig file
+SET(PC_LDFLAGS -l${this_target})
 CONFIGURE_FILE(${this_target}.pc.in ${CMAKE_SOURCE_DIR}/${this_target}.pc @ONLY)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/${this_target}.pc DESTINATION lib/pkgconfig)


More information about the Tizen-submit mailing list