Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
hpp-doc
Commits
69f8cbe6
Commit
69f8cbe6
authored
Mar 15, 2019
by
Guilhem Saurel
Browse files
gepetto-viewer needs pythonqt and uses Qt 4
and gepetto-viewer-corba get's its Qt version from gepetto-viewer
parent
28ba5296
Changes
1
Hide whitespace changes
Inline
Side-by-side
doc/Makefile
View file @
69f8cbe6
...
...
@@ -211,9 +211,9 @@ gepetto-viewer_repository=${GEPETTO_REPO}
gepetto-viewer-corba_branch
=
devel
gepetto-viewer-corba_repository
=
${GEPETTO_REPO}
ifeq
(${QT_VERSION}, 5)
gepetto-viewer
-corba
_extra_flags
=
-DUSE_QT4
=
OFF
gepetto-viewer_extra_flags
=
-D
PROJECT_
USE_QT4
=
OFF
else
gepetto-viewer
-corba
_extra_flags
=
-DUSE_QT4
=
ON
gepetto-viewer_extra_flags
=
-D
PROJECT_
USE_QT4
=
ON
endif
pythonqt_branch
=
qt
${QT_VERSION}
...
...
@@ -315,7 +315,7 @@ osg-dae.configure.dep: collada-dom.install \
osg-dae.checkout
OpenSceneGraph-3.4.0.configure.dep
:
collada-dom.install
\
OpenSceneGraph-3.4.0.checkout
gepetto-viewer.configure.dep
:
gepetto-viewer.checkout
gepetto-viewer.configure.dep
:
pythonqt.install
gepetto-viewer.checkout
gepetto-viewer-corba.configure.dep
:
gepetto-viewer.install
\
pythonqt.install gepetto-viewer-corba.checkout
hpp-gepetto-viewer.configure.dep
:
gepetto-viewer-corba.install
\
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment