X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-api%2FCMakeLists.txt;h=19d9cb0a6475f19690d6b96f3c2058f704f0591a;hb=d8ff2aeae4e68d95e31f2c36ebcc41fa49c15036;hp=6ba8936b6971726f8f8a2a7b56c0a620f5287117;hpb=41bfe957df119c7d3693451fe94b950bccf70904;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/bt-api/CMakeLists.txt b/bt-api/CMakeLists.txt
index 6ba8936..19d9cb0 100644
--- a/bt-api/CMakeLists.txt
+++ b/bt-api/CMakeLists.txt
@@ -2,6 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(bt-service-api C)
 
 SET(SRCS
+../include/bt-internal-types.c
 bt-common.c
 bt-adapter.c
 bt-adapter-le.c
@@ -14,6 +15,7 @@ bt-hdp.c
 bt-avrcp.c
 bt-telephony.c
 bt-opp-client.c
+bt-map-client.c
 bt-obex-server.c
 bt-rfcomm-client.c
 bt-rfcomm-server.c
@@ -24,7 +26,12 @@ bt-gatt-service.c
 bt-pbap.c
 bt-hid-device.c
 bt-gatt-client.c
-bt-ipsp.c)
+bt-ipsp.c
+bt-dpm.c
+bt-proximity.c
+bt-tds.c
+bt-otp.c
+bt-mesh.c)
 
 SET(HEADERS
 bluetooth-api.h
@@ -33,7 +40,10 @@ bluetooth-audio-api.h
 bluetooth-telephony-api.h
 bluetooth-media-control.h
 bluetooth-scmst-api.h
-bluetooth-ipsp-api.h)
+bluetooth-ipsp-api.h
+bluetooth-gatt-server-api.h
+bluetooth-gatt-client-api.h
+bluetooth-mesh-api.h)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
@@ -50,7 +60,6 @@ INCLUDE(FindPkgConfig)
 
 SET(PKG_MODULES
 	dlog
-	dbus-glib-1
 	gobject-2.0
 	gmodule-2.0
 	vconf
@@ -58,7 +67,7 @@ SET(PKG_MODULES
 	glib-2.0
 	gio-2.0
 	gio-unix-2.0
-	dbus-1
+	capi-system-info
 )
 
 INCLUDE(FindPkgConfig)
@@ -71,7 +80,7 @@ ENDFOREACH(flag)
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Wall")
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -g ")
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
 
 FIND_PROGRAM(UNAME NAMES uname)
 EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
@@ -80,20 +89,15 @@ IF("${ARCH}" STREQUAL "arm")
 	MESSAGE("add -DTARGET")
 ENDIF("${ARCH}" STREQUAL "arm")
 
-ADD_DEFINITIONS("-DHPS_FEATURE")
-
-FIND_PROGRAM(MARSHALTOOL NAMES glib-genmarshal)
-EXEC_PROGRAM("${MARSHALTOOL}" ARGS "--prefix=marshal ${CMAKE_CURRENT_SOURCE_DIR}/marshal.list --header > ${CMAKE_CURRENT_SOURCE_DIR}/include/marshal.h")
-EXEC_PROGRAM("${MARSHALTOOL}" ARGS "--prefix=marshal ${CMAKE_CURRENT_SOURCE_DIR}/marshal.list --body > ${CMAKE_CURRENT_SOURCE_DIR}/marshal.c")
-
-FIND_PROGRAM(DBUS_BINDING_TOOL NAMES dbus-binding-tool)
-EXEC_PROGRAM("${DBUS_BINDING_TOOL}" ARGS "--prefix=bt ${CMAKE_CURRENT_SOURCE_DIR}/bt-request-service.xml --mode=glib-client --output=${CMAKE_CURRENT_SOURCE_DIR}/include/bt-request-service.h")
-EXEC_PROGRAM("${DBUS_BINDING_TOOL}" ARGS "--prefix=bluetooth_gatt ${CMAKE_CURRENT_SOURCE_DIR}/bt-gatt.xml --mode=glib-server --output=${CMAKE_CURRENT_SOURCE_DIR}/include/bt-gatt-glue.h")
+#ADD_DEFINITIONS("-DTIZEN_FEATURE_BT_HPS")
+ADD_DEFINITIONS("-DTIZEN_FEATURE_BT_OTP")
+ADD_DEFINITIONS("-DTIZEN_FEATURE_BT_DPM")
+ADD_DEFINITIONS("-DTIZEN_GATT_CLIENT")
 
 ADD_LIBRARY(bluetooth-api SHARED ${SRCS})
 SET_TARGET_PROPERTIES(bluetooth-api PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(bluetooth-api PROPERTIES VERSION ${VERSION})
-TARGET_LINK_LIBRARIES(bluetooth-api ${packages_LDFLAGS})
+TARGET_LINK_LIBRARIES(bluetooth-api ${packages_LDFLAGS} -ldl)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-api.pc.in ${CMAKE_CURRENT_BINARY_DIR}/bluetooth-api.pc @ONLY)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/bluetooth-api.pc DESTINATION ${LIBDIR}/pkgconfig)
 INSTALL(TARGETS bluetooth-api DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries)