projects
/
platform
/
core
/
connectivity
/
bluetooth-frwk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tizen' into tizen_5.5
[platform/core/connectivity/bluetooth-frwk.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
f616072
..
03cf2ec
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-2,14
+2,15
@@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
ADD_SUBDIRECTORY(bt-api)
ADD_SUBDIRECTORY(bt-api)
-IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_TEST_EMUL")
-ADD_SUBDIRECTORY(bt-service-emul)
-ELSE()
-ADD_SUBDIRECTORY(bt-service)
-ENDIF()
+ADD_SUBDIRECTORY(bt-oal)
+ADD_SUBDIRECTORY(bt-service-adaptation)
+# TODO_40 : 4.0 merge
ADD_SUBDIRECTORY(bt-httpproxy)
ADD_SUBDIRECTORY(bt-httpproxy)
+# TODO_40 : 4.0 merge
+ADD_SUBDIRECTORY(bt-otp)
+
ADD_SUBDIRECTORY(bt-core)
ADD_SUBDIRECTORY(plugin)
ADD_SUBDIRECTORY(bt-core)
ADD_SUBDIRECTORY(plugin)