From 88b53613a52eea3588a8d11eba6b0c439ff56ff9 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Mon, 26 May 2025 16:03:31 +0200 Subject: [PATCH 01/30] update Python versions --- .github/workflows/CI.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 254ce50..b9806a2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -44,7 +44,8 @@ jobs: strategy: matrix: - python: ['3.8', '3.9', '3.10', '3.11'] + # active versions: https://devguide.python.org/versions/ + python: ['3.9', '3.10', '3.11', '3.12', '3.13'] steps: - uses: actions/checkout@v3 @@ -72,7 +73,8 @@ jobs: strategy: matrix: - python: ['3.8', '3.9', '3.10', '3.11'] + # active versions: https://devguide.python.org/versions/ + python: ['3.9', '3.10', '3.11', '3.12', '3.13'] steps: - uses: actions/checkout@v3 @@ -108,7 +110,8 @@ jobs: strategy: matrix: - python: ['3.8', '3.9', '3.10', '3.11'] + # active versions: https://devguide.python.org/versions/ + python: ['3.9', '3.10', '3.11', '3.12', '3.13'] steps: - uses: actions/checkout@v3 From ba6702500f94e4e8898e963c66ac9a1cc5ab129e Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Mon, 26 May 2025 21:10:00 +0200 Subject: [PATCH 02/30] add setuptools --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b9806a2..a6b3f1b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -90,7 +90,7 @@ jobs: - name: Install dependencies run: | brew install eigen boost@1.85 - pip install cmake ninja wheel + pip install cmake ninja wheel setuptools - name: Build run: | From 8016050a850883e0b8620839579da3919ee22d12 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Mon, 26 May 2025 21:27:22 +0200 Subject: [PATCH 03/30] update flags --- .github/workflows/CI.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a6b3f1b..6945213 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -94,9 +94,7 @@ jobs: - name: Build run: | - export LDFLAGS="-L/opt/homebrew/opt/boost@1.85/lib" - export CPPFLAGS="-I/opt/homebrew/opt/boost@1.85/include" - python setup.py bdist_wheel + LDFLAGS="-L/opt/homebrew/opt/boost@1.85/lib" CPPFLAGS="-I/opt/homebrew/opt/boost@1.85/include" python setup.py bdist_wheel - name: Upload Build Artifact uses: actions/upload-artifact@v4 From fb81325f0f0260182d3601e3e95644a379513748 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Mon, 26 May 2025 21:31:09 +0200 Subject: [PATCH 04/30] latest boost --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6945213..f5f2fa3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -89,12 +89,12 @@ jobs: # Using older boost version to avoid compiler errors with io_service - name: Install dependencies run: | - brew install eigen boost@1.85 + brew install eigen boost pip install cmake ninja wheel setuptools - name: Build run: | - LDFLAGS="-L/opt/homebrew/opt/boost@1.85/lib" CPPFLAGS="-I/opt/homebrew/opt/boost@1.85/include" python setup.py bdist_wheel + python setup.py bdist_wheel - name: Upload Build Artifact uses: actions/upload-artifact@v4 From 59e6898fdbd364d0e16694e67ddfe113a2a56785 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Mon, 26 May 2025 21:42:06 +0200 Subject: [PATCH 05/30] io_service -> io_context --- include/libmotioncapture/fzmotion.h | 2 +- src/fzmotion.cpp | 6 +++--- src/optitrack.cpp | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/libmotioncapture/fzmotion.h b/include/libmotioncapture/fzmotion.h index 88a3b84..e5951b2 100644 --- a/include/libmotioncapture/fzmotion.h +++ b/include/libmotioncapture/fzmotion.h @@ -160,7 +160,7 @@ namespace libmotioncapture { static MotionCaptureFZMotion* s_pInstance; static recursive_mutex s_mutex; - boost::asio::io_service m_IOService; + boost::asio::io_context m_IOContext; udp::socket m_TransmissionSocket; udp::socket m_ConnectionSocket; udp::resolver m_Resolver; diff --git a/src/fzmotion.cpp b/src/fzmotion.cpp index adca7bf..121fb86 100644 --- a/src/fzmotion.cpp +++ b/src/fzmotion.cpp @@ -7,9 +7,9 @@ namespace libmotioncapture { const int iLocalPort, const string& strRemoteIP, const int iRemotePort - ) : m_ConnectionSocket(m_IOService), - m_TransmissionSocket(m_IOService), - m_Resolver(m_IOService){ + ) : m_ConnectionSocket(m_IOContext), + m_TransmissionSocket(m_IOContext), + m_Resolver(m_IOContext){ this->init(); this->setConnectionInfo(strLocalIP, iLocalPort, strRemoteIP, iRemotePort); this->connect(); diff --git a/src/optitrack.cpp b/src/optitrack.cpp index 3c61a9c..8308066 100644 --- a/src/optitrack.cpp +++ b/src/optitrack.cpp @@ -45,8 +45,8 @@ namespace libmotioncapture { : version() , versionMajor(0) , versionMinor(0) - , io_service() - , socket(io_service) + , io_context() + , socket(io_context) , sender_endpoint() , data(MAX_PACKETSIZE) { @@ -240,7 +240,7 @@ namespace libmotioncapture { int versionMinor; uint64_t clockFrequency; // ticks/second for timestamps - boost::asio::io_service io_service; + boost::asio::io_context io_context; boost::asio::ip::udp::socket socket; boost::asio::ip::udp::endpoint sender_endpoint; std::vector data; @@ -285,9 +285,9 @@ namespace libmotioncapture { pImpl = new MotionCaptureOptitrackImpl; // Connect to command port to query version - boost::asio::io_service io_service_cmd; - udp::socket socket_cmd(io_service_cmd, udp::endpoint(udp::v4(), 0)); - udp::resolver resolver_cmd(io_service_cmd); + boost::asio::io_context io_context_cmd; + udp::socket socket_cmd(io_context_cmd, udp::endpoint(udp::v4(), 0)); + udp::resolver resolver_cmd(io_context_cmd); udp::endpoint endpoint_cmd = *resolver_cmd.resolve({udp::v4(), hostname, std::to_string(port_command)}); typedef struct From 6185618c74cba77f046ae30597b093864fb62011 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Mon, 26 May 2025 22:00:54 +0200 Subject: [PATCH 06/30] boost 1.87 support --- src/fzmotion.cpp | 8 ++++---- src/optitrack.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/fzmotion.cpp b/src/fzmotion.cpp index 121fb86..8a5ec81 100644 --- a/src/fzmotion.cpp +++ b/src/fzmotion.cpp @@ -54,7 +54,7 @@ namespace libmotioncapture { this->m_strRemoteIP = strRemoteIP; this->m_iRemoteCPort = iRemotePort; - this->m_localCEndpoint = udp::endpoint(address_v4::from_string(this->m_strLocalIP), this->m_iLocalCPort); + this->m_localCEndpoint = udp::endpoint(make_address_v4(this->m_strLocalIP), this->m_iLocalCPort); udp::resolver::query query(udp::v4(), this->m_strRemoteIP, std::to_string(this->m_iRemoteCPort)); this->m_remoteCEndpoint = *this->m_Resolver.resolve(query); @@ -162,13 +162,13 @@ namespace libmotioncapture { ReleaseBuffer(pBuffer); //joint multicast group - this->m_localMEndpoint = udp::endpoint(address_v4::from_string(this->m_strMulticastGroup), this->m_iDataReceivePort); + this->m_localMEndpoint = udp::endpoint(make_address_v4(this->m_strMulticastGroup), this->m_iDataReceivePort); if (this->m_TransmissionSocket.is_open() == false) { this->m_TransmissionSocket.open(this->m_localMEndpoint.protocol()); this->m_TransmissionSocket.set_option(udp::socket::reuse_address(true)); this->m_TransmissionSocket.set_option(ip::multicast::hops(5)); this->m_TransmissionSocket.set_option(ip::multicast::enable_loopback(true)); - this->m_TransmissionSocket.set_option(ip::multicast::join_group(address_v4::from_string(this->m_strMulticastGroup), address_v4::from_string(this->m_strLocalIP))); + this->m_TransmissionSocket.set_option(ip::multicast::join_group(make_address_v4(this->m_strMulticastGroup), make_address_v4(this->m_strLocalIP))); this->m_TransmissionSocket.bind(this->m_localMEndpoint); } @@ -189,7 +189,7 @@ namespace libmotioncapture { } if (this->m_TransmissionSocket.is_open() == true) { - this->m_TransmissionSocket.set_option(ip::multicast::leave_group(address_v4::from_string(this->m_strMulticastGroup), address_v4::from_string(this->m_strLocalIP))); + this->m_TransmissionSocket.set_option(ip::multicast::leave_group(make_address_v4(this->m_strMulticastGroup), make_address_v4(this->m_strLocalIP))); this->m_TransmissionSocket.close(); } diff --git a/src/optitrack.cpp b/src/optitrack.cpp index 8308066..a41bcd5 100644 --- a/src/optitrack.cpp +++ b/src/optitrack.cpp @@ -354,8 +354,8 @@ namespace libmotioncapture { pImpl->parseModelDef(modelDef.data()); // connect to data port to receive mocap data - auto listen_address_boost = boost::asio::ip::address_v4::from_string(interface_ip); - auto multicast_address_boost = boost::asio::ip::address_v4::from_string(multicast_address); + auto listen_address_boost = boost::asio::ip::make_address_v4(interface_ip); + auto multicast_address_boost = boost::asio::ip::make_address_v4(multicast_address); // Create the socket so that multiple may be bound to the same address. boost::asio::ip::udp::endpoint listen_endpoint( From 3cfbaed49445103b524211e4cd7f06529f7afa18 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Mon, 26 May 2025 22:29:00 +0200 Subject: [PATCH 07/30] more boost fixes --- src/fzmotion.cpp | 6 ++---- src/optitrack.cpp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/fzmotion.cpp b/src/fzmotion.cpp index 8a5ec81..85f63b6 100644 --- a/src/fzmotion.cpp +++ b/src/fzmotion.cpp @@ -55,10 +55,8 @@ namespace libmotioncapture { this->m_iRemoteCPort = iRemotePort; this->m_localCEndpoint = udp::endpoint(make_address_v4(this->m_strLocalIP), this->m_iLocalCPort); - - udp::resolver::query query(udp::v4(), this->m_strRemoteIP, std::to_string(this->m_iRemoteCPort)); - this->m_remoteCEndpoint = *this->m_Resolver.resolve(query); - + this->m_remoteCEndpoint = udp::endpoint(make_address(this->m_strRemoteIP), this->m_iRemoteCPort); + s_mutex.unlock(); } //connect with the server diff --git a/src/optitrack.cpp b/src/optitrack.cpp index a41bcd5..bb7c27b 100644 --- a/src/optitrack.cpp +++ b/src/optitrack.cpp @@ -288,7 +288,7 @@ namespace libmotioncapture { boost::asio::io_context io_context_cmd; udp::socket socket_cmd(io_context_cmd, udp::endpoint(udp::v4(), 0)); udp::resolver resolver_cmd(io_context_cmd); - udp::endpoint endpoint_cmd = *resolver_cmd.resolve({udp::v4(), hostname, std::to_string(port_command)}); + udp::endpoint endpoint_cmd(boost::asio::ip::make_address(hostname), port_command); typedef struct { From 112e23d08c70de1585ba3383ad4cb31a4df029c6 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Mon, 26 May 2025 22:54:30 +0200 Subject: [PATCH 08/30] update vicon-datastream-sdk to v1.12 --- deps/vicon-datastream-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/vicon-datastream-sdk b/deps/vicon-datastream-sdk index a06c604..5f1d7aa 160000 --- a/deps/vicon-datastream-sdk +++ b/deps/vicon-datastream-sdk @@ -1 +1 @@ -Subproject commit a06c60494f771bc23c2f9336947e4bd531a67db1 +Subproject commit 5f1d7aa9da7a97f3de41aa479c34b8adcd91573b From 5f8ace1f959aacd5387e84e972dbede358c676a2 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Mon, 26 May 2025 23:56:19 +0200 Subject: [PATCH 09/30] disable vicon --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f7cdbe..4bed837 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ option(LIBMOTIONCAPTURE_BUILD_PYTHON_BINDINGS "Generate Python Bindings" ON) option(LIBMOTIONCAPTURE_ENABLE_QUALISYS "Enable Qualisys" ON) option(LIBMOTIONCAPTURE_ENABLE_OPTITRACK "Enable Optitrack" ON) option(LIBMOTIONCAPTURE_ENABLE_OPTITRACK_CLOSED_SOURCE "Enable Optitrack (Closed Source)" ON) -option(LIBMOTIONCAPTURE_ENABLE_VICON "Enable Vicon" ON) +option(LIBMOTIONCAPTURE_ENABLE_VICON "Enable Vicon" OFF) option(LIBMOTIONCAPTURE_ENABLE_NOKOV "Enable Nokov" OFF) option(LIBMOTIONCAPTURE_ENABLE_VRPN "Enable VRPN" ON) option(LIBMOTIONCAPTURE_ENABLE_FZMOTION "Enable FZMOTION" ON) From b14a567e30451f4514991a98e4c30aa0a24389e8 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Mon, 26 May 2025 23:56:29 +0200 Subject: [PATCH 10/30] windows boost update --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f5f2fa3..56a6508 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -127,10 +127,10 @@ jobs: vcpkg install eigen3:x64-windows - name: Install boost - uses: MarkusJx/install-boost@v1.0.1 + uses: MarkusJx/install-boost@v2 id: install-boost with: - boost_version: 1.73.0 + boost_version: 1.87.0 toolset: msvc14.2 - name: Build From 15bd99d0b8e1f702d656f8dd3f5375e193bcf7ab Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Tue, 27 May 2025 00:06:43 +0200 Subject: [PATCH 11/30] more CI fixes --- .github/workflows/CI.yml | 1 - CMakeLists.txt | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 56a6508..182f085 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -131,7 +131,6 @@ jobs: id: install-boost with: boost_version: 1.87.0 - toolset: msvc14.2 - name: Build run: python setup.py bdist_wheel diff --git a/CMakeLists.txt b/CMakeLists.txt index 4bed837..debf83d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,6 +83,10 @@ if (LIBMOTIONCAPTURE_ENABLE_OPTITRACK) ${my_files} src/optitrack.cpp ) + set(my_libraries + ${my_libraries} + Boost::system + ) endif() if (LIBMOTIONCAPTURE_ENABLE_OPTITRACK_CLOSED_SOURCE) From 8cdaa1333d15b6b307c7317942e7fc4916a65dd0 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Tue, 27 May 2025 00:12:15 +0200 Subject: [PATCH 12/30] windows CI fixes --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 182f085..a5b8bcf 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -123,7 +123,7 @@ jobs: - name: Install dependencies run: | - pip install wheel + pip install wheel setuptools vcpkg install eigen3:x64-windows - name: Install boost From 394cc6ceee907d105e2ff91616457e1953186c2d Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Tue, 27 May 2025 15:51:15 +0200 Subject: [PATCH 13/30] add missing header --- src/vrpn.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vrpn.cpp b/src/vrpn.cpp index 78d9b3f..bba2924 100644 --- a/src/vrpn.cpp +++ b/src/vrpn.cpp @@ -5,6 +5,7 @@ #include #include #include +#include // VRPN #include From f77b4e832580b2ed420adcc9990061088b5f9a23 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Tue, 27 May 2025 16:11:31 +0200 Subject: [PATCH 14/30] re-enable VICON --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index debf83d..4b512fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ option(LIBMOTIONCAPTURE_BUILD_PYTHON_BINDINGS "Generate Python Bindings" ON) option(LIBMOTIONCAPTURE_ENABLE_QUALISYS "Enable Qualisys" ON) option(LIBMOTIONCAPTURE_ENABLE_OPTITRACK "Enable Optitrack" ON) option(LIBMOTIONCAPTURE_ENABLE_OPTITRACK_CLOSED_SOURCE "Enable Optitrack (Closed Source)" ON) -option(LIBMOTIONCAPTURE_ENABLE_VICON "Enable Vicon" OFF) +option(LIBMOTIONCAPTURE_ENABLE_VICON "Enable Vicon" ON) option(LIBMOTIONCAPTURE_ENABLE_NOKOV "Enable Nokov" OFF) option(LIBMOTIONCAPTURE_ENABLE_VRPN "Enable VRPN" ON) option(LIBMOTIONCAPTURE_ENABLE_FZMOTION "Enable FZMOTION" ON) From 226b27a482d65f648b555037a31d6ae02df8ef9e Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Tue, 27 May 2025 16:27:32 +0200 Subject: [PATCH 15/30] update NatNetSDKCrossplatform --- deps/NatNetSDKCrossplatform | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/NatNetSDKCrossplatform b/deps/NatNetSDKCrossplatform index 0a9b1e5..c9d37e4 160000 --- a/deps/NatNetSDKCrossplatform +++ b/deps/NatNetSDKCrossplatform @@ -1 +1 @@ -Subproject commit 0a9b1e532d5d168e3b3569e97670c73181b2577c +Subproject commit c9d37e46b81730bc00347aee7f1f4c16ed3f705b From 8c1cb2501bf31fdf82c09ad1d4492037796ecdbf Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Tue, 27 May 2025 16:39:37 +0200 Subject: [PATCH 16/30] update manylinux --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a5b8bcf..be4cbee 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -53,7 +53,7 @@ jobs: submodules: true - name: Pull builder image - run: docker pull quay.io/pypa/manylinux_2_28_x86_64 + run: docker pull quay.io/pypa/manylinux_2_34_x86_64 - name: Python version run: python --version From 07a991c1c8f8a3f1d5dab79dff3d27c71fdb484c Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Tue, 27 May 2025 16:50:02 +0200 Subject: [PATCH 17/30] update linux OS image --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index be4cbee..89592e1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -39,7 +39,7 @@ jobs: path: "dist/*.tar.gz" Linux: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: Source strategy: From c68a40bed789ff1c52391fbd139942376ce7c198 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Tue, 27 May 2025 17:01:56 +0200 Subject: [PATCH 18/30] Revert "update NatNetSDKCrossplatform" This reverts commit 226b27a482d65f648b555037a31d6ae02df8ef9e. --- .github/workflows/CI.yml | 4 ++-- deps/NatNetSDKCrossplatform | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 89592e1..a5b8bcf 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -39,7 +39,7 @@ jobs: path: "dist/*.tar.gz" Linux: - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 needs: Source strategy: @@ -53,7 +53,7 @@ jobs: submodules: true - name: Pull builder image - run: docker pull quay.io/pypa/manylinux_2_34_x86_64 + run: docker pull quay.io/pypa/manylinux_2_28_x86_64 - name: Python version run: python --version diff --git a/deps/NatNetSDKCrossplatform b/deps/NatNetSDKCrossplatform index c9d37e4..0a9b1e5 160000 --- a/deps/NatNetSDKCrossplatform +++ b/deps/NatNetSDKCrossplatform @@ -1 +1 @@ -Subproject commit c9d37e46b81730bc00347aee7f1f4c16ed3f705b +Subproject commit 0a9b1e532d5d168e3b3569e97670c73181b2577c From 1cb8305cd7f9128568dbf1b4548a52a297bb796c Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Tue, 27 May 2025 17:02:52 +0200 Subject: [PATCH 19/30] update vicon-datastream-sdk --- deps/vicon-datastream-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/vicon-datastream-sdk b/deps/vicon-datastream-sdk index 5f1d7aa..cb1d266 160000 --- a/deps/vicon-datastream-sdk +++ b/deps/vicon-datastream-sdk @@ -1 +1 @@ -Subproject commit 5f1d7aa9da7a97f3de41aa479c34b8adcd91573b +Subproject commit cb1d2662202d93399026c667a314038a59c89082 From 10dd32b1e8679cc1a978e0fa455898c8f5a6fea6 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Tue, 27 May 2025 17:30:10 +0200 Subject: [PATCH 20/30] update vicon-datastream-sdk --- deps/vicon-datastream-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/vicon-datastream-sdk b/deps/vicon-datastream-sdk index cb1d266..9ddbe7c 160000 --- a/deps/vicon-datastream-sdk +++ b/deps/vicon-datastream-sdk @@ -1 +1 @@ -Subproject commit cb1d2662202d93399026c667a314038a59c89082 +Subproject commit 9ddbe7c47bca4dfae6e08ca5e26e2154134f39c5 From 1229864711d9961fe281f72869d9020d5b142052 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Tue, 27 May 2025 17:41:03 +0200 Subject: [PATCH 21/30] update vicon-datastream-sdk --- deps/vicon-datastream-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/vicon-datastream-sdk b/deps/vicon-datastream-sdk index 9ddbe7c..50f9e33 160000 --- a/deps/vicon-datastream-sdk +++ b/deps/vicon-datastream-sdk @@ -1 +1 @@ -Subproject commit 9ddbe7c47bca4dfae6e08ca5e26e2154134f39c5 +Subproject commit 50f9e336845281253fb447e87d4710aa60d727fc From 393f64600a75e63b6ce2d8b086df60e4e5ceb7d1 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Tue, 27 May 2025 23:42:31 +0200 Subject: [PATCH 22/30] update vicon-datastream-sdk --- deps/vicon-datastream-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/vicon-datastream-sdk b/deps/vicon-datastream-sdk index 50f9e33..1f8a506 160000 --- a/deps/vicon-datastream-sdk +++ b/deps/vicon-datastream-sdk @@ -1 +1 @@ -Subproject commit 50f9e336845281253fb447e87d4710aa60d727fc +Subproject commit 1f8a5068179d39ef19de559e34f4ff8918674273 From c54187238c0ec6f4d523268b7a78d7cc6f84e70c Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Tue, 27 May 2025 23:57:35 +0200 Subject: [PATCH 23/30] update vicon-datastream-sdk --- deps/vicon-datastream-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/vicon-datastream-sdk b/deps/vicon-datastream-sdk index 1f8a506..a21c9c8 160000 --- a/deps/vicon-datastream-sdk +++ b/deps/vicon-datastream-sdk @@ -1 +1 @@ -Subproject commit 1f8a5068179d39ef19de559e34f4ff8918674273 +Subproject commit a21c9c8e5fd797e4833e19b78ad310d857c2f6c1 From 3c4417383d6198c8660c888611fd0ccfbff0fbfb Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Wed, 28 May 2025 00:09:43 +0200 Subject: [PATCH 24/30] windows CI fix --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a5b8bcf..ad01e45 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -131,6 +131,7 @@ jobs: id: install-boost with: boost_version: 1.87.0 + toolset: msvc - name: Build run: python setup.py bdist_wheel From 6cacb2f7da39af8064719a85fce1cb2bd33fac82 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Wed, 28 May 2025 22:02:49 +0200 Subject: [PATCH 25/30] fix windows build --- .github/workflows/CI.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ad01e45..35cee68 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -86,7 +86,6 @@ jobs: with: python-version: ${{ matrix.python }} - # Using older boost version to avoid compiler errors with io_service - name: Install dependencies run: | brew install eigen boost @@ -130,7 +129,7 @@ jobs: uses: MarkusJx/install-boost@v2 id: install-boost with: - boost_version: 1.87.0 + boost_version: 1.73.0 toolset: msvc - name: Build From a2e1fae06d6e1e82bc1b82c2ff14725209dfbb40 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Wed, 28 May 2025 22:12:04 +0200 Subject: [PATCH 26/30] fix windows CI --- .github/workflows/CI.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 35cee68..a798a4b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -86,6 +86,7 @@ jobs: with: python-version: ${{ matrix.python }} + # Using older boost version to avoid compiler errors with io_service - name: Install dependencies run: | brew install eigen boost @@ -129,7 +130,8 @@ jobs: uses: MarkusJx/install-boost@v2 id: install-boost with: - boost_version: 1.73.0 + boost_version: 1.87.0 + platform_version: 2022 toolset: msvc - name: Build From 611d8914398026d0c801e76337f0a08f5302b03d Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Wed, 28 May 2025 22:31:22 +0200 Subject: [PATCH 27/30] fix windows build --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a798a4b..cec82df 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -133,6 +133,7 @@ jobs: boost_version: 1.87.0 platform_version: 2022 toolset: msvc + link: shared - name: Build run: python setup.py bdist_wheel From 88fc8080d8494c6a4fd1e728ded07a71e2a15bca Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Wed, 28 May 2025 22:44:42 +0200 Subject: [PATCH 28/30] fix CI --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index cec82df..fb3e1c9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -133,7 +133,7 @@ jobs: boost_version: 1.87.0 platform_version: 2022 toolset: msvc - link: shared + link: static - name: Build run: python setup.py bdist_wheel From b34f01b0200f3b68cf6138b2601b7b5c0e16d64d Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Wed, 28 May 2025 23:10:59 +0200 Subject: [PATCH 29/30] fix CI --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b512fb..11823bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,9 @@ set(my_include_directories ${Boost_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS} ) -set(my_link_directories) +set(my_link_directories + ${Boost_LINK_DIRS} +) set(my_files src/motioncapture.cpp src/mock.cpp From 2ce822972b16bf7036f414741f88044b0c388059 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Wed, 28 May 2025 23:43:32 +0200 Subject: [PATCH 30/30] fix CI --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 11823bb..ab6f28b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ set(my_include_directories ${EIGEN3_INCLUDE_DIRS} ) set(my_link_directories - ${Boost_LINK_DIRS} + ${Boost_LIBRARY_DIRS} ) set(my_files src/motioncapture.cpp