Skip to content
Snippets Groups Projects

Changes to allow for support on macOS

Merged Daniel Joseph Antrim requested to merge dantrim_mac_support into devel
All threads resolved!

What

This MR makes a few changes and fixes to allow for compiling on macOS.

All checks are done on my laptop, running macOS Catalina v10.15.7. The changes should not really depend on the explicit macOS, however.

Remove Linux-specific sources from the build

The main change is to the CMakeLists.txt file in libDevCom. There a new list of sources are created which contain the source for devices that depend explicitly on Linux drivers. If, during the CMake configuration step it is detected that we are on macOS, those sources are not included in the build.

The current sources that are found to depend explicitly on Linux device drivers are: SPIDevCom and I2CDevCom.

Fix the check for Clang

Updates the check for Clang version by using the MATCHES requirement instead of the STREQUAL requirement in src/CMakeLists.txt:

if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")

becomes

if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")

Miscellaneous

Change CMake message outputs from message(...) to message(STATUS...)

Edited by Daniel Joseph Antrim

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • added 1 commit

    • 388e8333 - message status, and check for CMAKE_SYSTEM_NAME

    Compare with previous version

  • Daniel Joseph Antrim resolved all threads

    resolved all threads

  • added 1 commit

    Compare with previous version

  • Daniel Joseph Antrim changed the description

    changed the description

  • mentioned in issue #56 (closed)

  • Karol Krizka approved this merge request

    approved this merge request

  • Hi @epianori is this able to be merged?

  • mentioned in commit 4b72c35c

  • Please register or sign in to reply
    Loading