Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 32 additions & 0 deletions .github/workflows/mac-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: macOS build and tests
on:
workflow_dispatch:
pull_request:
push:
branches:
- master
schedule:
- cron: '38 2 * * *'

jobs:
mac-build:
name: macOS (${{ matrix.arch }})
timeout-minutes: 30
runs-on: ${{ matrix.runner }}
strategy:
fail-fast: false
matrix:
include:
- runner: macos-15
arch: arm64
- runner: macos-15-intel
arch: x86_64

steps:
- uses: actions/checkout@v6
- name: configure
run: mkdir build && cd build && cmake .. -DBUILDING_TESTS=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}
- name: build
run: cmake --build build
- name: test
run: cd build && ctest --output-on-failure
2 changes: 2 additions & 0 deletions .github/workflows/win-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
push:
branches:
- master
schedule:
- cron: '38 2 * * *'

jobs:
win-build:
Expand Down
103 changes: 0 additions & 103 deletions 3rdparty/endian/endian.h

This file was deleted.

15 changes: 0 additions & 15 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,7 @@ target_compile_features(urcl PUBLIC cxx_std_17)

if(MSVC)
target_link_libraries(urcl ws2_32)
target_include_directories(urcl PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/endian>
$<INSTALL_INTERFACE:include/${PROJECT_NAME}/3rdparty>
)
else()
if(APPLE)
target_include_directories(urcl PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/endian>
$<INSTALL_INTERFACE:include/${PROJECT_NAME}/3rdparty>
)
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
target_compile_options(urcl PRIVATE -Wall -Wextra -Wno-unused-parameter)

Expand Down Expand Up @@ -121,11 +111,6 @@ install(TARGETS urcl EXPORT urcl_targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
install(DIRECTORY include/ DESTINATION include)
if(MSVC OR APPLE)
install(DIRECTORY 3rdparty/endian/ DESTINATION include/${PROJECT_NAME}/3rdparty
FILES_MATCHING PATTERN "*.h"
)
endif()

install(EXPORT urcl_targets
DESTINATION lib/cmake/ur_client_library
Expand Down
2 changes: 1 addition & 1 deletion include/ur_client_library/comm/bin_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#pragma once

#include <assert.h>
#include <endian.h>
#include <ur_client_library/portable_endian.h>
#include <inttypes.h>
#include <array>
#include <bitset>
Expand Down
2 changes: 1 addition & 1 deletion include/ur_client_library/comm/package_serializer.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#ifndef UR_CLIENT_LIBRARY_PACKAGE_SERIALIZER_H_INCLUDED
#define UR_CLIENT_LIBRARY_PACKAGE_SERIALIZER_H_INCLUDED

#include <endian.h>
#include <ur_client_library/portable_endian.h>
#include <cstdint>
#include <cstring>
#include <string>
Expand Down
1 change: 0 additions & 1 deletion include/ur_client_library/control/reverse_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#include "ur_client_library/ur/robot_receive_timeout.h"
#include "ur_client_library/ur/version_information.h"
#include <cstring>
#include <endian.h>
#include <condition_variable>
#include <list>

Expand Down
Loading
Loading