fixed macos build

Author: serges147

CMakeLists.txt

@@ -26,11 +26,11 @@ set(test_dir "${CMAKE_SOURCE_DIR}/test")
 set(include_dir "${CMAKE_SOURCE_DIR}/include")
 set(submodules_dir "${CMAKE_SOURCE_DIR}/submodules")
 
+set(CXX_FLAG_SET "")
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     # Disable PSABI warnings in GCC (on RPi).
     list(APPEND CXX_FLAG_SET "-Wno-psabi")
 endif()
-
 add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${CXX_FLAG_SET}>")
 
 # clang-format

init.d/ocvsmd.toml

@@ -14,7 +14,7 @@ unique_id = []
 # UDP has priorioty over CAN if both types are present.
 # Supported formats:
 # - 'udp://<ip4>'
-# - 'socketcan:<can_device>'
+# - 'socketcan:<can_device>' (linux only)
 interfaces = [
     'udp://127.0.0.1',
 ]

src/daemon/engine/CMakeLists.txt

@@ -36,18 +36,19 @@ target_include_directories(udpard
         INTERFACE SYSTEM ${submodules_dir}/libudpard/libudpard
 )
 
-add_library(canard
-        ${submodules_dir}/libcanard/libcanard/canard.c
-)
-target_include_directories(canard
-        INTERFACE SYSTEM ${submodules_dir}/libcanard/libcanard
-)
+if (${PLATFORM_OS_TYPE} STREQUAL "linux")
+    add_library(canard
+            ${submodules_dir}/libcanard/libcanard/canard.c
+    )
+    target_include_directories(canard
+            INTERFACE SYSTEM ${submodules_dir}/libcanard/libcanard
+    )
+endif ()
 
 add_library(ocvsmd_engine
         config.cpp
         cyphal/file_provider.cpp
         engine.cpp
-        platform/can/socketcan.c
         platform/udp/udp.c
         svc/file_server/list_roots_service.cpp
         svc/file_server/pop_root_service.cpp
@@ -58,10 +59,17 @@ add_library(ocvsmd_engine
 )
 target_link_libraries(ocvsmd_engine
         PUBLIC udpard
-        PUBLIC canard
         PUBLIC ${engine_transpiled}
         PUBLIC ocvsmd_common
 )
+if (${PLATFORM_OS_TYPE} STREQUAL "linux")
+    target_sources(ocvsmd_engine
+            platform/can/socketcan.c
+    )
+    target_link_libraries(ocvsmd_engine
+            PUBLIC canard
+    )
+endif ()
 target_include_directories(ocvsmd_engine
         PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
 )

src/daemon/engine/cyphal/transport_helpers.hpp

@@ -10,12 +10,15 @@
 
 #include <cetl/pf17/cetlpf.hpp>
 #include <libcyphal/errors.hpp>
-#include <libcyphal/transport/can/can_transport.hpp>
 #include <libcyphal/transport/errors.hpp>
 #include <libcyphal/transport/udp/udp_transport.hpp>
 
 #include <spdlog/fmt/fmt.h>
 
+#ifdef __linux__
+#include <libcyphal/transport/can/can_transport.hpp>
+#endif
+
 namespace ocvsmd
 {
 namespace daemon
@@ -61,6 +64,8 @@ struct TransportHelpers
 
     };  // Printers
 
+#ifdef __linux__
+
     struct CanTransientErrorReporter
     {
         using Report = libcyphal::transport::can::ICanTransport::TransientErrorReport;
@@ -111,6 +116,8 @@ struct TransportHelpers
 
     };  // CanTransientErrorReporter
 
+#endif  // __linux__
+
     struct UdpTransientErrorReporter
     {
         using Report = libcyphal::transport::udp::IUdpTransport::TransientErrorReport;

src/daemon/engine/engine.cpp

@@ -6,7 +6,6 @@
 #include "engine.hpp"
 
 #include "config.hpp"
-#include "cyphal/can_transport_bag.hpp"
 #include "cyphal/file_provider.hpp"
 #include "cyphal/udp_transport_bag.hpp"
 #include "engine_helpers.hpp"
@@ -34,6 +33,10 @@
 #include <string>
 #include <utility>
 
+#ifdef __linux__
+#include "cyphal/can_transport_bag.hpp"
+#endif
+
 namespace ocvsmd
 {
 namespace daemon
@@ -59,11 +62,13 @@ cetl::optional<std::string> Engine::init()
     }
     else
     {
+#ifdef __linux__
         if (auto maybe_can_transport_bag = cyphal::CanTransportBag::make(memory_, executor_, config_))
         {
             any_transport_bag_ = std::move(maybe_can_transport_bag);
         }
         else
+#endif  // __linux__
         {
             std::string msg = "Failed to create Cyphal transport.";
             logger_->error(msg);