Skip to content

Commit f190c05

Browse files
authored
bump to v36.0.2
1 parent 97b8f87 commit f190c05

66 files changed

Lines changed: 1249 additions & 763 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121
- uses: ./.github/actions/setup-build
22-
- run: |
23-
cargo make build
24-
cargo make test
22+
- run: cargo make build
23+
- run: cargo make test
24+
if: ${{ matrix.os != 'windows-latest' }}
25+
- run: cargo make test -DBUILD_LINK_ETHERCRAB_TEST=OFF
26+
if: ${{ matrix.os == 'windows-latest' }}

.github/workflows/pr.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@ jobs:
4040
steps:
4141
- uses: actions/checkout@v4
4242
- uses: ./.github/actions/setup-build
43-
- run: |
44-
cargo make build
45-
cargo make test
43+
- run: cargo make build
44+
- run: cargo make test
45+
if: ${{ matrix.os != 'windows-latest' }}
46+
- run: cargo make test -DBUILD_LINK_ETHERCRAB_TEST=OFF
47+
if: ${{ matrix.os == 'windows-latest' }}
4648

4749
all-tests-passed:
4850
if: ${{ always() }}

CMakeLists.txt

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
44
message(FATAL_ERROR "In-source builds not allowed. Please make a new directory (called a build directory) and run CMake from there. You may need to remove CMakeCache.txt. ")
55
endif()
66

7-
project(autd3 VERSION 35.0.1)
7+
project(autd3 VERSION 36.0.2)
88

99
message(STATUS "Build AUTD3: ${PROJECT_VERSION}")
1010

@@ -30,7 +30,7 @@ else()
3030
FetchContent_Declare(
3131
eigen
3232
GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
33-
GIT_TAG 3.4.0)
33+
GIT_TAG 5.0.0)
3434
FetchContent_MakeAvailable(eigen)
3535
endif()
3636

@@ -142,3 +142,35 @@ if(WIN32)
142142
add_dependencies(autd3_link_simulator autd3capi_link_simulator)
143143
endif()
144144
add_library(autd3::link::simulator ALIAS autd3_link_simulator)
145+
146+
add_library(autd3_link_remote INTERFACE)
147+
target_link_libraries(autd3_link_remote INTERFACE autd3::common)
148+
autd_target_link_libraries(autd3_link_remote autd3capi_link_remote)
149+
if(WIN32)
150+
target_link_libraries(autd3_link_remote INTERFACE ws2_32)
151+
add_custom_target(autd3capi_link_remote)
152+
add_custom_command(TARGET autd3capi_link_remote POST_BUILD
153+
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/$<CONFIG>
154+
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/bin/autd3capi_link_remote.dll" ${CMAKE_BINARY_DIR}/$<CONFIG>
155+
VERBATIM
156+
)
157+
set_property(TARGET autd3capi_link_remote PROPERTY FOLDER "autd3capi")
158+
add_dependencies(autd3_link_remote autd3capi_link_remote)
159+
endif()
160+
add_library(autd3::link::remote ALIAS autd3_link_remote)
161+
162+
add_library(autd3_link_ethercrab INTERFACE)
163+
target_link_libraries(autd3_link_ethercrab INTERFACE autd3::common)
164+
autd_target_link_libraries(autd3_link_ethercrab autd3capi_link_ethercrab)
165+
if(WIN32)
166+
target_link_libraries(autd3_link_ethercrab INTERFACE ws2_32)
167+
add_custom_target(autd3capi_link_ethercrab)
168+
add_custom_command(TARGET autd3capi_link_ethercrab POST_BUILD
169+
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/$<CONFIG>
170+
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_SOURCE_DIR}/bin/autd3capi_link_ethercrab.dll" ${CMAKE_BINARY_DIR}/$<CONFIG>
171+
VERBATIM
172+
)
173+
set_property(TARGET autd3capi_link_ethercrab PROPERTY FOLDER "autd3capi")
174+
add_dependencies(autd3_link_ethercrab autd3capi_link_ethercrab)
175+
endif()
176+
add_library(autd3::link::ethercrab ALIAS autd3_link_ethercrab)

Makefile.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ mkdir -p build/tests
6060
[tasks.test-cmake]
6161
cwd = "./build/tests"
6262
command = "cmake"
63-
args = ["../../tests"]
63+
args = ["../../tests", "${@}"]
6464

6565
[tasks.test-build]
6666
cwd = "./build/tests"

0 commit comments

Comments
 (0)