michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: bluetooth: Don't #include gatt files from src files

Browse source 
Due to a bug in KBuild, bluetooth samples needed to #include the gatt
sources to re-use code between samples. This bug was not ported to
CMake so we can stop applying this workaround.

gatt source files are now directly added to the 'app' library instead
of having adapter source files in the app's src directory that
\#include's the gatt files.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
This commit is contained in:
Sebastian Bøe 2018-06-13 14:13:27 +02:00 • committed by Johan Hedberg
commit 8f3fea300a
21 changed files with 27 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
samples/bluetooth/peripheral/CMakeLists.txt
View file

@ -3,10 +3,10 @@ project(NONE)
target_sources(app PRIVATE target_sources(app PRIVATE
src/main.c src/main.c
src/hrs.c ../gatt/hrs.c
src/dis.c ../gatt/dis.c
src/bas.c ../gatt/bas.c
src/cts.c ../gatt/cts.c
) )
zephyr_library_include_directories($ENV{ZEPHYR_BASE}/samples/bluetooth) zephyr_library_include_directories($ENV{ZEPHYR_BASE}/samples/bluetooth)

2
samples/bluetooth/peripheral/src/bas.c
View file

@ -1,2 +0,0 @@
/* Workaround build system bug that will put objects in source dir */
#include "../../gatt/bas.c"

2
samples/bluetooth/peripheral/src/cts.c
View file

@ -1,2 +0,0 @@
/* Workaround build system bug that will put objects in source dir */
#include "../../gatt/cts.c"

2
samples/bluetooth/peripheral/src/dis.c
View file

@ -1,2 +0,0 @@
/* Workaround build system bug that will put objects in source dir */
#include "../../gatt/dis.c"

2
samples/bluetooth/peripheral/src/hrs.c
View file

@ -1,2 +0,0 @@
/* Workaround build system bug that will put objects in source dir */
#include "../../gatt/hrs.c"

6
samples/bluetooth/peripheral_csc/CMakeLists.txt
View file

@ -2,6 +2,10 @@ include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
project(NONE) project(NONE)
FILE(GLOB app_sources src/*.c) FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources}) target_sources(app PRIVATE
${app_sources}
../gatt/dis.c
../gatt/bas.c
)
zephyr_library_include_directories($ENV{ZEPHYR_BASE}/samples/bluetooth) zephyr_library_include_directories($ENV{ZEPHYR_BASE}/samples/bluetooth)

2
samples/bluetooth/peripheral_csc/src/bas.c
View file

@ -1,2 +0,0 @@
/* Workaround build system bug that will put objects in source dir */
#include "../../gatt/bas.c"

2
samples/bluetooth/peripheral_csc/src/dis.c
View file

@ -1,2 +0,0 @@
/* Workaround build system bug that will put objects in source dir */
#include "../../gatt/dis.c"

5
samples/bluetooth/peripheral_dis/CMakeLists.txt
View file

@ -2,6 +2,9 @@ include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
project(NONE) project(NONE)
FILE(GLOB app_sources src/*.c) FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources}) target_sources(app PRIVATE
${app_sources}
../gatt/dis.c
)
zephyr_library_include_directories($ENV{ZEPHYR_BASE}/samples/bluetooth) zephyr_library_include_directories($ENV{ZEPHYR_BASE}/samples/bluetooth)

2
samples/bluetooth/peripheral_dis/src/dis.c
View file

@ -1,2 +0,0 @@
/* Workaround build system bug that will put objects in source dir */
#include "../../gatt/dis.c"

4
samples/bluetooth/peripheral_esp/CMakeLists.txt
View file

@ -3,8 +3,8 @@ project(NONE)
target_sources(app PRIVATE target_sources(app PRIVATE
src/main.c src/main.c
src/bas.c ../gatt/bas.c
src/dis.c ../gatt/dis.c
) )
zephyr_library_include_directories($ENV{ZEPHYR_BASE}/samples/bluetooth) zephyr_library_include_directories($ENV{ZEPHYR_BASE}/samples/bluetooth)

2
samples/bluetooth/peripheral_esp/src/bas.c
View file

@ -1,2 +0,0 @@
/* Workaround build system bug that will put objects in source dir */
#include "../../gatt/bas.c"

2
samples/bluetooth/peripheral_esp/src/dis.c
View file

@ -1,2 +0,0 @@
/* Workaround build system bug that will put objects in source dir */
#include "../../gatt/dis.c"

7
samples/bluetooth/peripheral_hids/CMakeLists.txt
View file

@ -2,6 +2,11 @@ include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
project(NONE) project(NONE)
FILE(GLOB app_sources src/*.c) FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources}) target_sources(app PRIVATE
${app_sources}
../gatt/hog.c
../gatt/dis.c
../gatt/bas.c
)
zephyr_library_include_directories($ENV{ZEPHYR_BASE}/samples/bluetooth) zephyr_library_include_directories($ENV{ZEPHYR_BASE}/samples/bluetooth)

2
samples/bluetooth/peripheral_hids/src/bas.c
View file

@ -1,2 +0,0 @@
/* Workaround build system bug that will put objects in source dir */
#include "../../gatt/bas.c"

2
samples/bluetooth/peripheral_hids/src/dis.c
View file

@ -1,2 +0,0 @@
/* Workaround build system bug that will put objects in source dir */
#include "../../gatt/dis.c"

2
samples/bluetooth/peripheral_hids/src/hog.c
View file

@ -1,2 +0,0 @@
/* Workaround build system bug that will put objects in source dir */
#include "../../gatt/hog.c"

7
samples/bluetooth/peripheral_hr/CMakeLists.txt
View file

@ -2,6 +2,11 @@ include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
project(NONE) project(NONE)
FILE(GLOB app_sources src/*.c) FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources}) target_sources(app PRIVATE
${app_sources}
../gatt/hrs.c
../gatt/dis.c
../gatt/bas.c
)
zephyr_library_include_directories($ENV{ZEPHYR_BASE}/samples/bluetooth) zephyr_library_include_directories($ENV{ZEPHYR_BASE}/samples/bluetooth)

2
samples/bluetooth/peripheral_hr/src/bas.c
View file

@ -1,2 +0,0 @@
/* Workaround build system bug that will put objects in source dir */
#include "../../gatt/bas.c"

2
samples/bluetooth/peripheral_hr/src/dis.c
View file

@ -1,2 +0,0 @@
/* Workaround build system bug that will put objects in source dir */
#include "../../gatt/dis.c"

2
samples/bluetooth/peripheral_hr/src/hrs.c
View file

@ -1,2 +0,0 @@
/* Workaround build system bug that will put objects in source dir */
#include "../../gatt/hrs.c"