First Draft of the UsbDataHandler

CMakeLists.txt

@@ -61,14 +61,6 @@ set(linker_OPTS)
 include("cmake_generated/cmake_generated.cmake")
 
 
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib/nanopb/extra)
-find_package(Nanopb REQUIRED)
-include_directories(${NANOPB_INCLUDE_DIRS})
-nanopb_generate_cpp(PROTO_SRCS PROTO_HDRS RELPATH proto proto/firmware.proto)
-add_library(PROTOS ${PROTO_SRCS} ${PROTO_HDRS})
-target_include_directories(PROTOS PUBLIC ${NANOPB_INCLUDE_DIRS})
-
-
 # these options need to be applied for the hole project
 # so that all subprojects and libaries are compiled and compatable
 add_compile_options(    
@@ -99,6 +91,15 @@ add_link_options(
     -Wl,--print-memory-usage
 )
 
+# Add project symbols (macros)
+add_compile_definitions(
+    ${symbols_SYMB}
+    ${symbols_c_SYMB}
+    ${symbols_cxx_SYMB}
+    ${symbols_asm_SYMB}
+)
+
+
 # Link directories setup
 # Must be before executable is added
 link_directories(${CMAKE_PROJECT_NAME} ${link_DIRS})
@@ -118,17 +119,18 @@ include_directories(
     $<$<COMPILE_LANGUAGE:ASM>: ${include_asm_DIRS}>
 )
 
-# Add project symbols (macros)
-add_compile_definitions(
-    ${symbols_SYMB}
-    ${symbols_c_SYMB}
-    ${symbols_cxx_SYMB}
-    ${symbols_asm_SYMB}
-)
 
 add_subdirectory("lib")
 add_subdirectory("Application")
 
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib/nanopb/extra)
+find_package(Nanopb REQUIRED)
+include_directories(${NANOPB_INCLUDE_DIRS})
+nanopb_generate_cpp(PROTO_SRCS PROTO_HDRS RELPATH proto proto/firmware.proto)
+add_library(PROTOS ${PROTO_SRCS} ${PROTO_HDRS})
+target_include_directories(PROTOS PUBLIC ${NANOPB_INCLUDE_DIRS} ${PROJECT_BINARY_DIR})
+include_directories(${PROJECT_BINARY_DIR})
+
 # Add linked libraries
 # target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC protobuf-nanopb-static)
 target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC uart_driver)
@@ -141,10 +143,10 @@ target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE
     $<$<COMPILE_LANGUAGE:C>: >
     $<$<COMPILE_LANGUAGE:CXX>:
     
-    # -Wno-volatile
-    # -Wold-style-cast
-    # -Wuseless-cast
-    # -Wsuggest-override
+     -Wno-volatile
+     -Wold-style-cast
+     -Wuseless-cast
+     -Wsuggest-override
     >
     $<$<COMPILE_LANGUAGE:ASM>:-x assembler-with-cpp -MMD -MP>
     $<$<CONFIG:Debug>:-Og -g3 -ggdb>