Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ubxlib builds #188

Merged
merged 1 commit into from
Jan 30, 2024
+5 −7
Merged

Fix ubxlib builds #188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions modules/ubxlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ endif() # CONFIG_UBXLIB_GEODESIC
# The actual library we're building
zephyr_library_named(ubxlib)

# Extra modules
list(APPEND ZEPHYR_EXTRA_MODULES ${UBXLIB_BASE}/drivers)

# Include paths that should be exposed to applications ("UBXLIB_INC")
zephyr_include_directories(
${UBXLIB_BASE}
Expand Down Expand Up @@ -122,12 +125,6 @@ target_include_directories(ubxlib PRIVATE
${ZEPHYR_BASE}/include
)

# Hacking this in directly for now, ultimately
# we don't want the mbedtls dependency anyway!
target_include_directories(ubxlib PRIVATE
${ZEPHYR_BASE}/../modules/crypto/mbedtls/include
)

# Unconditional sources
add_src_dir(${UBXLIB_BASE}/common/assert/src)
add_src_dir(${UBXLIB_BASE}/common/at_client/src)
Expand Down Expand Up @@ -162,7 +159,6 @@ list(APPEND UBXLIB_SRC
${UBXLIB_BASE}/common/network/src/u_network_private_gnss_stub.c
${UBXLIB_BASE}/common/network/src/u_network_private_wifi_stub.c
${UBXLIB_BASE}/port/clib/u_port_clib_mktime64.c
${UBXLIB_BASE}/port/platform/common/mbedtls/u_port_crypto.c
${UBXLIB_BASE}/port/u_port_heap.c
${UBXLIB_BASE}/port/u_port_timezone.c
${UBXLIB_BASE}/port/u_port_resource.c
Expand All @@ -173,6 +169,8 @@ list(APPEND UBXLIB_SRC
${UBXLIB_BASE}/port/platform/zephyr/src/u_port_uart.c
${UBXLIB_BASE}/port/platform/zephyr/src/u_port_i2c.c
${UBXLIB_BASE}/port/platform/zephyr/src/u_port_spi.c
${UBXLIB_BASE}/port/platform/zephyr/src/u_port_ppp.c
${UBXLIB_BASE}/port/platform/zephyr/src/u_port_board_cfg.c
${UBXLIB_BASE}/port/platform/zephyr/src/u_port_private.c
)

Expand Down
Loading