Skip to content

Commit ef9abfb

Browse files
committed
cmake: remove unused include directory
Since we moved the parsing of protobufs to rust we don't use this include directory any more.
1 parent 924a147 commit ef9abfb

File tree

3 files changed

+1
-13
lines changed

3 files changed

+1
-13
lines changed

src/CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,6 @@ set(INCLUDES
171171
)
172172
set(INCLUDES ${INCLUDES} PARENT_SCOPE)
173173

174-
set(SYSTEMINCLUDES
175-
${CMAKE_BINARY_DIR}/messages
176-
)
177-
set(SYSTEMINCLUDES ${SYSTEMINCLUDES} PARENT_SCOPE)
178-
179174
#-----------------------------------------------------------------------------
180175
# Build embedded firmware
181176

@@ -268,7 +263,7 @@ endif()
268263
get_property(WALLY_INCLUDES TARGET wallycore PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
269264
get_property(SECP256k1_INCLUDES TARGET secp256k1 PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
270265

271-
foreach(include ${INCLUDES} ${SYSTEMINCLUDES} ${SAMD51A_INCLUDES} ${ASF4_INCLUDES} ${ASF4_MIN_INCLUDES} ${CMSIS_INCLUDES} ${WALLY_INCLUDES} ${SECP256k1_INCLUDES})
266+
foreach(include ${INCLUDES} ${SAMD51A_INCLUDES} ${ASF4_INCLUDES} ${ASF4_MIN_INCLUDES} ${CMSIS_INCLUDES} ${WALLY_INCLUDES} ${SECP256k1_INCLUDES})
272267
list(APPEND RUST_INCLUDES -I${include})
273268
endforeach()
274269
if(NOT CMAKE_CROSSCOMPILING)
@@ -563,7 +558,6 @@ if(CMAKE_CROSSCOMPILING)
563558
add_executable(${elf} ${BOOTLOADER-SOURCES})
564559
target_link_libraries(${elf} PRIVATE c asf4-drivers-min samd51a-ds -Wl,-u,exception_table)
565560
target_include_directories(${elf} PRIVATE ${INCLUDES})
566-
target_include_directories(${elf} SYSTEM PRIVATE ${SYSTEMINCLUDES})
567561
target_compile_definitions(${elf} PRIVATE BOOTLOADER "APP_BTC=0" "APP_LTC=0" "APP_ETH=0" "APP_U2F=0")
568562
# needed to find version.h
569563
target_include_directories(${elf} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
@@ -622,7 +616,6 @@ if(CMAKE_CROSSCOMPILING)
622616
asf4-drivers
623617
-Wl,-u,exception_table)
624618
target_include_directories(${elf} PRIVATE ${INCLUDES})
625-
target_include_directories(${elf} SYSTEM PRIVATE ${SYSTEMINCLUDES})
626619

627620
# needed to find version.h
628621
target_include_directories(${elf} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

test/simulator/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ add_custom_target(bitbox_merged-simulator DEPENDS ${CMAKE_ARCHIVE_OUTPUT_DIRECTO
9393
target_include_directories(
9494
bitbox_objects-simulator
9595
SYSTEM PUBLIC
96-
${SYSTEMINCLUDES}
9796
${CMAKE_SOURCE_DIR}/external
9897
${CMAKE_SOURCE_DIR}/external/ctaes
9998
${CMAKE_SOURCE_DIR}/external/fatfs/source
@@ -113,7 +112,6 @@ target_include_directories(
113112
target_include_directories(
114113
bitbox-simulator
115114
SYSTEM PUBLIC
116-
${SYSTEMINCLUDES}
117115
${CMAKE_SOURCE_DIR}/external
118116
${CMAKE_SOURCE_DIR}/external/ctaes
119117
${CMAKE_SOURCE_DIR}/external/fatfs/source

test/unit-test/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ add_custom_target(bitbox_merged DEPENDS ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libbit
9999
target_include_directories(
100100
bitbox_objects
101101
SYSTEM PUBLIC
102-
${SYSTEMINCLUDES}
103102
${CMAKE_SOURCE_DIR}/external
104103
${CMAKE_SOURCE_DIR}/external/ctaes
105104
${CMAKE_SOURCE_DIR}/external/fatfs/source
@@ -119,7 +118,6 @@ target_include_directories(
119118
target_include_directories(
120119
bitbox
121120
SYSTEM PUBLIC
122-
${SYSTEMINCLUDES}
123121
${CMAKE_SOURCE_DIR}/external
124122
${CMAKE_SOURCE_DIR}/external/ctaes
125123
${CMAKE_SOURCE_DIR}/external/fatfs/source
@@ -190,7 +188,6 @@ add_library(u2f-util
190188
target_include_directories(
191189
u2f-util
192190
SYSTEM PUBLIC
193-
${SYSTEMINCLUDES}
194191
${CMAKE_CURRENT_SOURCE_DIR}
195192
)
196193
target_include_directories(

0 commit comments

Comments
 (0)