Merge pull request #1291 from NickeZ/nickez/remove-protoc

Remove unused include directory

Author: NickeZ

.ci/ci

@@ -6,10 +6,14 @@ set -e
 # Deny warnings in rust. CI will fail to compile any code with warnings in it.
 export RUSTFLAGS="-Dwarnings"
 
-# Check style
-
+# Check style for C
 ./.ci/check-style
+
+# Check that we can generate protobuf definitions for python
+make -C py clean
 make -C py
+
+# Check style for python
 ./.ci/check-pep8
 
 # check ./releases sigs

py/Makefile

@@ -2,5 +2,6 @@ all:
 	${MAKE} -C bitbox02
 
 clean:
+	${MAKE} -C bitbox02 clean
 	find -name *.pyc -delete
 	find -name __pycache__ -empty -delete

src/CMakeLists.txt

@@ -171,11 +171,6 @@ set(INCLUDES
 )
 set(INCLUDES ${INCLUDES} PARENT_SCOPE)
 
-set(SYSTEMINCLUDES
-  ${CMAKE_BINARY_DIR}/messages
-)
-set(SYSTEMINCLUDES ${SYSTEMINCLUDES} PARENT_SCOPE)
-
 #-----------------------------------------------------------------------------
 # Build embedded firmware
 
@@ -268,7 +263,7 @@ endif()
 get_property(WALLY_INCLUDES TARGET wallycore PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
 get_property(SECP256k1_INCLUDES TARGET secp256k1 PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
 
-foreach(include ${INCLUDES} ${SYSTEMINCLUDES} ${SAMD51A_INCLUDES} ${ASF4_INCLUDES} ${ASF4_MIN_INCLUDES} ${CMSIS_INCLUDES} ${WALLY_INCLUDES} ${SECP256k1_INCLUDES})
+foreach(include ${INCLUDES} ${SAMD51A_INCLUDES} ${ASF4_INCLUDES} ${ASF4_MIN_INCLUDES} ${CMSIS_INCLUDES} ${WALLY_INCLUDES} ${SECP256k1_INCLUDES})
   list(APPEND RUST_INCLUDES -I${include})
 endforeach()
 if(NOT CMAKE_CROSSCOMPILING)
@@ -563,7 +558,6 @@ if(CMAKE_CROSSCOMPILING)
     add_executable(${elf} ${BOOTLOADER-SOURCES})
     target_link_libraries(${elf} PRIVATE c asf4-drivers-min samd51a-ds -Wl,-u,exception_table)
     target_include_directories(${elf} PRIVATE ${INCLUDES})
-    target_include_directories(${elf} SYSTEM PRIVATE ${SYSTEMINCLUDES})
     target_compile_definitions(${elf} PRIVATE BOOTLOADER "APP_BTC=0" "APP_LTC=0" "APP_ETH=0" "APP_U2F=0")
     # needed to find version.h
     target_include_directories(${elf} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
@@ -622,7 +616,6 @@ if(CMAKE_CROSSCOMPILING)
         asf4-drivers
         -Wl,-u,exception_table)
     target_include_directories(${elf} PRIVATE ${INCLUDES})
-    target_include_directories(${elf} SYSTEM PRIVATE ${SYSTEMINCLUDES})
 
     # needed to find version.h
     target_include_directories(${elf} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

test/simulator/CMakeLists.txt

@@ -93,7 +93,6 @@ add_custom_target(bitbox_merged-simulator DEPENDS ${CMAKE_ARCHIVE_OUTPUT_DIRECTO
 target_include_directories(
   bitbox_objects-simulator
   SYSTEM PUBLIC
-  ${SYSTEMINCLUDES}
   ${CMAKE_SOURCE_DIR}/external
   ${CMAKE_SOURCE_DIR}/external/ctaes
   ${CMAKE_SOURCE_DIR}/external/fatfs/source
@@ -113,7 +112,6 @@ target_include_directories(
 target_include_directories(
   bitbox-simulator
   SYSTEM PUBLIC
-  ${SYSTEMINCLUDES}
   ${CMAKE_SOURCE_DIR}/external
   ${CMAKE_SOURCE_DIR}/external/ctaes
   ${CMAKE_SOURCE_DIR}/external/fatfs/source

test/unit-test/CMakeLists.txt

@@ -99,7 +99,6 @@ add_custom_target(bitbox_merged DEPENDS ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libbit
 target_include_directories(
   bitbox_objects
   SYSTEM PUBLIC
-  ${SYSTEMINCLUDES}
   ${CMAKE_SOURCE_DIR}/external
   ${CMAKE_SOURCE_DIR}/external/ctaes
   ${CMAKE_SOURCE_DIR}/external/fatfs/source
@@ -119,7 +118,6 @@ target_include_directories(
 target_include_directories(
   bitbox
   SYSTEM PUBLIC
-  ${SYSTEMINCLUDES}
   ${CMAKE_SOURCE_DIR}/external
   ${CMAKE_SOURCE_DIR}/external/ctaes
   ${CMAKE_SOURCE_DIR}/external/fatfs/source
@@ -190,7 +188,6 @@ add_library(u2f-util
 target_include_directories(
   u2f-util
   SYSTEM PUBLIC
-  ${SYSTEMINCLUDES}
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 target_include_directories(