Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
monado
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
blender
monado
Commits
fd33a2a9
Commit
fd33a2a9
authored
6 years ago
by
Ryan Pavlik
Browse files
Options
Downloads
Patches
Plain Diff
build: Adjust montrack build.
Prober build now works on Buster, but not on Arch container.
parent
dd4c2880
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/xrt/targets/CMakeLists.txt
+38
-1
38 additions, 1 deletion
src/xrt/targets/CMakeLists.txt
src/xrt/targets/openxr/CMakeLists.txt
+0
-42
0 additions, 42 deletions
src/xrt/targets/openxr/CMakeLists.txt
with
38 additions
and
43 deletions
src/xrt/targets/CMakeLists.txt
+
38
−
1
View file @
fd33a2a9
...
...
@@ -29,6 +29,43 @@ if(BUILD_DRIVER_PSVR)
list
(
APPEND DRIVER_LIBRARIES
${
HIDAPI_LIBRARIES
}
)
endif
()
if
(
BUILD_DRIVER_MONTRACK
)
list
(
APPEND DRIVER_OBJECTS
$<TARGET_OBJECTS:drv_montrack>
$<TARGET_OBJECTS:frameserver>
$<TARGET_OBJECTS:filter>
$<TARGET_OBJECTS:optical_tracking>
)
if
(
BUILD_WITH_LIBUVC AND BUILD_WITH_JPEG
)
list
(
APPEND DRIVER_LIBRARIES
${
libuvc_LIBRARIES
}
${
LIBUSB1_LIBRARIES
}
)
endif
()
if
(
BUILD_WITH_JPEG
)
list
(
APPEND DRIVER_LIBRARIES
${
JPEG_LIBRARIES
}
)
endif
()
if
(
BUILD_WITH_FFMPEG
)
list
(
APPEND DRIVER_LIBRARIES
avformat
# TODO find rather than hard code!
avcodec
# TODO find rather than hard code!
avutil
# TODO find rather than hard code!
)
endif
()
if
(
BUILD_WITH_UVBI
)
list
(
APPEND DRIVER_LIBRARIES
uvbi::uvbi_plugin_parts
)
endif
()
list
(
APPEND DRIVER_LIBRARIES
opencv_core
opencv_calib3d
opencv_highgui
opencv_imgproc
opencv_imgcodecs
opencv_features2d
opencv_video
)
endif
()
add_subdirectory
(
common
)
add_subdirectory
(
openxr
)
#add_subdirectory(prober)
#
add_subdirectory(prober)
This diff is collapsed.
Click to expand it.
src/xrt/targets/openxr/CMakeLists.txt
+
0
−
42
View file @
fd33a2a9
...
...
@@ -89,48 +89,6 @@ if(DRIVER_LIBRARIES)
target_link_libraries
(
${
RUNTIME_TARGET
}
PRIVATE
${
DRIVER_LIBRARIES
}
)
endif
()
if
(
BUILD_DRIVER_MONTRACK
)
target_sources
(
${
RUNTIME_TARGET
}
PRIVATE
$<TARGET_OBJECTS:drv_montrack>
$<TARGET_OBJECTS:frameserver>
$<TARGET_OBJECTS:filter>
$<TARGET_OBJECTS:optical_tracking>
)
if
(
BUILD_WITH_LIBUVC AND BUILD_WITH_JPEG
)
target_link_libraries
(
${
RUNTIME_TARGET
}
PUBLIC
${
libuvc_LIBRARIES
}
${
LIBUSB1_LIBRARIES
}
)
endif
()
if
(
BUILD_WITH_JPEG
)
target_link_libraries
(
${
RUNTIME_TARGET
}
PUBLIC
${
JPEG_LIBRARIES
}
)
endif
()
if
(
BUILD_WITH_FFMPEG
)
target_link_libraries
(
${
RUNTIME_TARGET
}
PUBLIC
avformat
# TODO find rather than hard code!
avcodec
# TODO find rather than hard code!
avutil
# TODO find rather than hard code!
)
endif
()
if
(
BUILD_WITH_UVBI
)
target_link_libraries
(
${
RUNTIME_TARGET
}
PUBLIC
uvbi::uvbi_plugin_parts
)
endif
()
target_link_libraries
(
${
RUNTIME_TARGET
}
PUBLIC
jpeg
# TODO find rather than hard code!
opencv_core
opencv_calib3d
opencv_highgui
opencv_imgproc
opencv_imgcodecs
opencv_features2d
opencv_video
)
endif
()
if
(
CMAKE_SYSTEM_NAME STREQUAL
"Linux"
)
include
(
GNUInstallDirs
)
install
(
TARGETS
${
RUNTIME_TARGET
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment