Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
visp-debian
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor 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
SPINDLER Fabien
visp-debian
Commits
ce5b7a13
Commit
ce5b7a13
authored
10 years ago
by
SPINDLER Fabien
Committed by
Thomas Moulard
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix libdc1394 usage
parent
3c9449c5
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
debian/rules
+3
-4
3 additions, 4 deletions
debian/rules
with
3 additions
and
4 deletions
debian/rules
+
3
−
4
View file @
ce5b7a13
...
@@ -20,7 +20,6 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
...
@@ -20,7 +20,6 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
# Configura package and enable dependencies available on all platforms.
# Configura package and enable dependencies available on all platforms.
# dc1394: off (obsolete)
# libav (ffmpeg): available on all platforms
# libav (ffmpeg): available on all platforms
# opencv: available on all platforms
# opencv: available on all platforms
# coin3: available on all platforms
# coin3: available on all platforms
...
@@ -35,7 +34,7 @@ CONFIGURE_ARGS= \
...
@@ -35,7 +34,7 @@ CONFIGURE_ARGS= \
-DCMAKE_INSTALL_LIBDIR
:STRING
=
"lib/
$(
DEB_HOST_MULTIARCH
)
"
\
-DCMAKE_INSTALL_LIBDIR
:STRING
=
"lib/
$(
DEB_HOST_MULTIARCH
)
"
\
-DBUILD_DEMOS
=
ON
-DBUILD_TESTING
=
ON
-DBUILD_EXAMPLES
=
ON
\
-DBUILD_DEMOS
=
ON
-DBUILD_TESTING
=
ON
-DBUILD_EXAMPLES
=
ON
\
-DBUILD_SHARED_LIBS
=
ON
\
-DBUILD_SHARED_LIBS
=
ON
\
-DUSE_DC1394_1
=
OFF
-DUSE_FFMPEG
=
ON
\
-DUSE_FFMPEG
=
ON
\
-DUSE_OPENCV
=
ON
\
-DUSE_OPENCV
=
ON
\
-DUSE_COIN
=
ON
-DUSE_GSL
=
OFF
\
-DUSE_COIN
=
ON
-DUSE_GSL
=
OFF
\
-DUSE_LAPACK
=
ON
-DUSE_GSL
=
ON
-DUSE_OGRE
=
ON
\
-DUSE_LAPACK
=
ON
-DUSE_GSL
=
ON
-DUSE_OGRE
=
ON
\
...
@@ -44,11 +43,11 @@ CONFIGURE_ARGS= \
...
@@ -44,11 +43,11 @@ CONFIGURE_ARGS= \
# dc1394, v4l and ois are only available on Linux.
# dc1394, v4l and ois are only available on Linux.
ifneq
($(DEB_HOST_ARCH_OS),linux)
ifneq
($(DEB_HOST_ARCH_OS),linux)
CONFIGURE_ARGS
+=
-DUSE_DC1394
_2
=
OFF
-DUSE_V4L2
:BOOL
=
OFF
-DUSE_OIS
=
OFF
CONFIGURE_ARGS
+=
-DUSE_DC1394
=
OFF
-DUSE_V4L2
=
OFF
-DUSE_OIS
=
OFF
# OGRE support triggers ICE on FreeBSD, disable for now.
# OGRE support triggers ICE on FreeBSD, disable for now.
CONFIGURE_ARGS
+=
-DUSE_OGRE
=
OFF
CONFIGURE_ARGS
+=
-DUSE_OGRE
=
OFF
else
else
CONFIGURE_ARGS
+=
-DUSE_DC1394
_2
=
ON
-DUSE_V4L2
:BOOL
=
ON
-DUSE_OIS
=
ON
CONFIGURE_ARGS
+=
-DUSE_DC1394
=
ON
-DUSE_V4L2
=
ON
-DUSE_OIS
=
ON
endif
endif
# freenect is not available on hurd.
# freenect is not available on hurd.
...
...
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