X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=CMakeLists.txt;h=548eeecdec07e8b6e05f599dc241d3720f95342a;hb=14e5154772b9411a4941942e24cb600a103efa2e;hp=3f82e7967674fa81d3c86258da8958b29f31a6aa;hpb=2304f1c6bdc00a7db00eed1d325c061d7fd4f611;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f82e79..548eeec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,19 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-OPTION(LIBNOTIFY_SUPPORT "Enable libnotify for popup" Off)
-IF(LIBNOTIFY_SUPPORT)
-    ADD_DEFINITIONS("-DLIBNOTIFY_SUPPORT")
-ENDIF(LIBNOTIFY_SUPPORT)
-OPTION(MULTI_USER_SUPPORT "Enable multi-user support" OFF)
-IF(MULTI_USER_SUPPORT)
-    ADD_DEFINITIONS("-DMULTI_USER_SUPPORT")
-ENDIF(MULTI_USER_SUPPORT)
 
 ADD_SUBDIRECTORY(bt-api)
 
-ADD_SUBDIRECTORY(bt-service)
+ADD_SUBDIRECTORY(bt-oal)
+ADD_SUBDIRECTORY(bt-service-adaptation)
+
+IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_FEATURE_BT_HTTP_PROXY")
+#ADD_SUBDIRECTORY(bt-httpproxy)
+ENDIF()
+
+# TODO_40 : 4.0 merge
+ADD_SUBDIRECTORY(bt-otp)
 
 ADD_SUBDIRECTORY(bt-core)
 
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(plugin)
+
+ADD_SUBDIRECTORY(test)