test: fixed cpputest build's

This commit is contained in:
Dirk Helbig 2025-03-17 13:50:30 +01:00
parent 32b985fcd4
commit c763cd5141
11 changed files with 30 additions and 30 deletions

View File

@ -11,7 +11,7 @@ link_directories(${LIBUSB_LIBRARY_DIRS})
link_libraries(${LIBUSB_LIBRARIES})
# CppuTest
pkg_check_modules(CPPUTEST REQUIRED CppuTest)
pkg_check_modules(CPPUTEST REQUIRED cpputest)
include_directories(${CPPUTEST_INCLUDE_DIRS})
link_directories(${CPPUTEST_LIBRARY_DIRS})
link_libraries(${CPPUTEST_LIBRARIES})
@ -56,7 +56,7 @@ list(REMOVE_ITEM SOURCES_BLE ${SOURCES_BLE_OFF})
file(GLOB SOURCES_POSIX_OFF "../../platform/posix/le_device_db_fs.c")
list(REMOVE_ITEM SOURCES_POSIX ${SOURCES_POSIX_OFF})
set(SOURCES
set(SOURCES
${SOURCES_MD5}
${SOURCES_YXML}
${SOURCES_BLUEDROID}

View File

@ -8,7 +8,7 @@ set (BTSTACK_ROOT ${CMAKE_SOURCE_DIR}/../../)
find_package(PkgConfig REQUIRED)
# CppuTest
pkg_check_modules(CPPUTEST REQUIRED CppuTest)
pkg_check_modules(CPPUTEST REQUIRED cpputest)
include_directories(${CPPUTEST_INCLUDE_DIRS})
link_directories(${CPPUTEST_LIBRARY_DIRS})
link_libraries(${CPPUTEST_LIBRARIES})

View File

@ -8,7 +8,7 @@ set (BTSTACK_ROOT ${CMAKE_SOURCE_DIR}/../../)
find_package(PkgConfig REQUIRED)
# CppuTest
pkg_check_modules(CPPUTEST REQUIRED CppuTest)
pkg_check_modules(CPPUTEST REQUIRED cpputest)
include_directories(${CPPUTEST_INCLUDE_DIRS})
link_directories(${CPPUTEST_LIBRARY_DIRS})
link_libraries(${CPPUTEST_LIBRARIES})

View File

@ -8,7 +8,7 @@ find_package(PkgConfig REQUIRED)
find_package(PkgConfig REQUIRED)
# CppuTest
pkg_check_modules(CPPUTEST REQUIRED CppuTest)
pkg_check_modules(CPPUTEST REQUIRED cpputest)
include_directories(${CPPUTEST_INCLUDE_DIRS})
link_directories(${CPPUTEST_LIBRARY_DIRS})
link_libraries(${CPPUTEST_LIBRARIES})

View File

@ -5,7 +5,7 @@ project(gatt-client-test)
find_package(PkgConfig REQUIRED)
# CppuTest
pkg_check_modules(CPPUTEST REQUIRED CppuTest)
pkg_check_modules(CPPUTEST REQUIRED cpputest)
include_directories(${CPPUTEST_INCLUDE_DIRS})
link_directories(${CPPUTEST_LIBRARY_DIRS})
link_libraries(${CPPUTEST_LIBRARIES})

View File

@ -5,7 +5,7 @@ project(gatt-client-test)
find_package(PkgConfig REQUIRED)
# CppuTest
pkg_check_modules(CPPUTEST REQUIRED CppuTest)
pkg_check_modules(CPPUTEST REQUIRED cpputest)
include_directories(${CPPUTEST_INCLUDE_DIRS})
link_directories(${CPPUTEST_LIBRARY_DIRS})
link_libraries(${CPPUTEST_LIBRARIES})

View File

@ -5,7 +5,7 @@ project(gatt_server)
find_package(PkgConfig REQUIRED)
# CppuTest
pkg_check_modules(CPPUTEST REQUIRED CppuTest)
pkg_check_modules(CPPUTEST REQUIRED cpputest)
include_directories(${CPPUTEST_INCLUDE_DIRS})
link_directories(${CPPUTEST_LIBRARY_DIRS})
link_libraries(${CPPUTEST_LIBRARIES})
@ -26,25 +26,25 @@ set(SOURCES
../../src/ble/att_db.c
../../src/ble/att_db_util.c
../../src/ble/att_server.c
../../src/ble/gatt-service/battery_service_server.c
../../src/ble/gatt-service/cycling_power_service_server.c
../../src/ble/gatt-service/cycling_speed_and_cadence_service_server.c
../../src/ble/gatt-service/device_information_service_server.c
../../src/ble/gatt-service/heart_rate_service_server.c
../../src/ble/gatt-service/hids_device.c
../../src/ble/gatt-service/nordic_spp_service_server.c
../../src/ble/gatt-service/ublox_spp_service_server.c
../../src/ble/le_device_db_memory.c
../../src/btstack_crypto.c
../../src/btstack_linked_list.c
../../src/btstack_memory.c
../../src/btstack_memory_pool.c
../../src/ble/gatt-service/battery_service_server.c
../../src/ble/gatt-service/cycling_power_service_server.c
../../src/ble/gatt-service/cycling_speed_and_cadence_service_server.c
../../src/ble/gatt-service/device_information_service_server.c
../../src/ble/gatt-service/heart_rate_service_server.c
../../src/ble/gatt-service/hids_device.c
../../src/ble/gatt-service/nordic_spp_service_server.c
../../src/ble/gatt-service/ublox_spp_service_server.c
../../src/ble/le_device_db_memory.c
../../src/btstack_crypto.c
../../src/btstack_linked_list.c
../../src/btstack_memory.c
../../src/btstack_memory_pool.c
../../src/btstack_tlv.c
../../platform/posix/btstack_tlv_posix.c
../../src/btstack_util.c
../../src/hci_cmd.c
../../src/hci_dump.c
mock.c
../../src/hci_cmd.c
../../src/hci_dump.c
mock.c
)
# Enable ASAN

View File

@ -5,7 +5,7 @@ project(test-hfp)
find_package(PkgConfig REQUIRED)
# CppuTest
pkg_check_modules(CPPUTEST REQUIRED CppuTest)
pkg_check_modules(CPPUTEST REQUIRED cpputest)
include_directories(${CPPUTEST_INCLUDE_DIRS})
link_directories(${CPPUTEST_LIBRARY_DIRS})
link_libraries(${CPPUTEST_LIBRARIES})

View File

@ -5,7 +5,7 @@ project(gatt-client-test)
find_package(PkgConfig REQUIRED)
# CppuTest
pkg_check_modules(CPPUTEST REQUIRED CppuTest)
pkg_check_modules(CPPUTEST REQUIRED cpputest)
include_directories(${CPPUTEST_INCLUDE_DIRS})
link_directories(${CPPUTEST_LIBRARY_DIRS})
link_libraries(${CPPUTEST_LIBRARIES})

View File

@ -5,7 +5,7 @@ project(gatt-client-test)
find_package(PkgConfig REQUIRED)
# CppuTest
pkg_check_modules(CPPUTEST REQUIRED CppuTest)
pkg_check_modules(CPPUTEST REQUIRED cpputest)
include_directories(${CPPUTEST_INCLUDE_DIRS})
link_directories(${CPPUTEST_LIBRARY_DIRS})
link_libraries(${CPPUTEST_LIBRARIES})

View File

@ -44,7 +44,7 @@ list(REMOVE_ITEM SOURCES_BLE ${SOURCES_OFF})
set(SOURCES_MESH_NEW main.c)
set(SOURCES
set(SOURCES
${SOURCES_POSIX}
${SOURCES_LIBUSB}
${SOURCES_SRC}
@ -71,7 +71,7 @@ foreach(EXAMPLE_FILE ${EXAMPLES_C})
message("example ${EXAMPLE} -- with GATT DB")
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE}.h
COMMAND ${CMAKE_SOURCE_DIR}/../../tool/compile_gatt.py ${CMAKE_SOURCE_DIR}/${EXAMPLE}.gatt ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE}.h > /dev/null
COMMAND ${CMAKE_SOURCE_DIR}/../../tool/compile_gatt.py ${CMAKE_SOURCE_DIR}/${EXAMPLE}.gatt ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE}.h > /dev/null
)
add_executable(${EXAMPLE} ${EXAMPLE_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE}.h)
else()
@ -85,7 +85,7 @@ endforeach(EXAMPLE_FILE)
find_package(PkgConfig REQUIRED)
# CppuTest
pkg_check_modules(CPPUTEST REQUIRED CppuTest)
pkg_check_modules(CPPUTEST REQUIRED cpputest)
include_directories(${CPPUTEST_INCLUDE_DIRS})
link_directories(${CPPUTEST_LIBRARY_DIRS})
link_libraries(${CPPUTEST_LIBRARIES})