Skip to content

Adds mac build support #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
weepeefa wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Adds mac build support #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe92b84
Adds mac build support
weepeefa Jun 19, 2021
56ca86b
Merge remote-tracking branch 'origin/main' into carlyle/mac_support
ysims Sep 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions cmake/Modules/Findwebots.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,34 @@ if(NOT webots_FOUND)
mark_as_advanced(webots_${lib}_LIBRARY)
endforeach(lib ${webots_libraries})

# Link all of our imported targets to our imported library
# Find the webots robotis libraries
set(robotis_libraries "robotis-op2;managers")
foreach(lib ${robotis_libraries})
find_library(
"webots_robotis_${lib}_LIBRARY"
NAMES ${lib}
PATHS ${WEBOTS_HOME}/projects/robots/robotis/darwin-op/libraries
PATH_SUFFIXES robotis-op2 managers
DOC "The Webots Robotis (${lib}) library"
)

# Setup an imported target for this library
add_library(webots::robotis::${lib} UNKNOWN IMPORTED)
set_target_properties(webots::robotis::${lib} PROPERTIES IMPORTED_LOCATION ${webots_robotis_${lib}_LIBRARY})

# Setup and export our variables
set(required_vars ${required_vars} "webots_robotis_${lib}_LIBRARY")
list(APPEND webots_LIBRARIES webots::robotis::${lib})
mark_as_advanced(webots_robotis_${lib}_LIBRARY)
endforeach(lib ${webots_libraries})

add_library(webots::webots INTERFACE IMPORTED)
target_link_libraries(webots::webots INTERFACE ${webots_LIBRARIES})

# Make sure the libraries exist in the parent scope
set(webots_LIBRARIES ${webots_LIBRARIES})

# Find our include path
# Find our webots include path
find_path(
"webots_INCLUDE_DIR"
NAMES "webots/Robot.hpp"
Expand Down
1 change: 1 addition & 0 deletions shared/message/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ add_library(
messages_protobuf OBJECT "${PROJECT_BINARY_DIR}/shared/message/messages.pb.cc"
"${PROJECT_BINARY_DIR}/shared/message/messages.pb.h"
)
target_link_libraries(messages_protobuf PRIVATE protobuf::libprotobuf)

# Turn off clang-tidy for them
set_target_properties(messages_protobuf PROPERTIES CXX_CLANG_TIDY "")