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
6 changes: 3 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
strategy:
matrix:
# active versions: https://devguide.python.org/versions/
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
python: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
strategy:
matrix:
# active versions: https://devguide.python.org/versions/
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
python: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
strategy:
matrix:
# active versions: https://devguide.python.org/versions/
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
python: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']

steps:
- uses: actions/checkout@v3
Expand Down
23 changes: 19 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ option(LIBMOTIONCAPTURE_BUILD_PYTHON_BINDINGS "Generate Python Bindings" ON)
option(LIBMOTIONCAPTURE_ENABLE_QUALISYS "Enable Qualisys" OFF)
option(LIBMOTIONCAPTURE_ENABLE_OPTITRACK "Enable Optitrack" ON)
option(LIBMOTIONCAPTURE_ENABLE_OPTITRACK_CLOSED_SOURCE "Enable Optitrack (Closed Source)" OFF)
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" OFF)
option(LIBMOTIONCAPTURE_ENABLE_FZMOTION "Enable FZMOTION" OFF)
Expand All @@ -18,7 +18,9 @@ set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

find_package(Boost 1.5 COMPONENTS system REQUIRED) # for optitrack
find_package(Threads REQUIRED)

find_package(Boost 1.5 REQUIRED) # for optitrack
add_definitions(
-DBOOST_DATE_TIME_NO_LIB
-DBOOST_REGEX_NO_LIB
Expand All @@ -27,6 +29,15 @@ add_definitions(

find_package(Eigen3 REQUIRED)

# Handle both old and new Eigen3 package configurations
if(NOT TARGET Eigen3::Eigen)
# Old-style Eigen3 package - create interface target
add_library(Eigen3::Eigen INTERFACE IMPORTED)
set_target_properties(Eigen3::Eigen PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${EIGEN3_INCLUDE_DIR};${EIGEN3_INCLUDE_DIRS}"
)
endif()

set(VICON_SDK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/vicon-datastream-sdk/)
set(QUALISYS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/qualisys_cpp_sdk/)
set(NATNET_SDK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/NatNetSDKCrossplatform/)
Expand Down Expand Up @@ -87,7 +98,8 @@ if (LIBMOTIONCAPTURE_ENABLE_OPTITRACK)
)
set(my_libraries
${my_libraries}
Boost::system
Boost::boost
Threads::Threads
)
endif()

Expand Down Expand Up @@ -232,7 +244,10 @@ target_link_directories(libmotioncapture PUBLIC
${my_link_directories}
)
target_link_libraries(libmotioncapture
${my_libraries}
PUBLIC
Eigen3::Eigen
PRIVATE
${my_libraries}
)
set_property(TARGET libmotioncapture PROPERTY POSITION_INDEPENDENT_CODE ON)

Expand Down
2 changes: 1 addition & 1 deletion deps/vicon-datastream-sdk
5 changes: 5 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ def build_extension(self, ext):
"-DCMAKE_BUILD_TYPE={}".format(cfg), # not used on MSVC, but no harm
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5" # to make sure vrpn compiles
]

# Add CMAKE_TOOLCHAIN_FILE for vcpkg on Windows
if "CMAKE_TOOLCHAIN_FILE" in os.environ:
cmake_args += ["-DCMAKE_TOOLCHAIN_FILE={}".format(os.environ["CMAKE_TOOLCHAIN_FILE"])]

Comment on lines +48 to +52
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this actually needed? I think it had no effect in the CI at the end.

build_args = []

if self.compiler.compiler_type != "msvc":
Expand Down