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
9abe4b28
Unverified
Commit
9abe4b28
authored
Apr 08, 2020
by
Joseph Mirabel
Committed by
GitHub
Apr 08, 2020
Browse files
Merge pull request #58 from DianeBury/devel
[Makefile] Add extra flag for gepetto-viewer for Qt5
parents
8237d0b2
bf529799
Changes
1
Hide whitespace changes
Inline
Side-by-side
doc/Makefile
View file @
9abe4b28
...
...
@@ -221,7 +221,11 @@ OpenSceneGraph-3.4.0_extra_flags= -DDESIRED_QT_VERSION=${QT_VERSION} -DCOLLADA_D
gepetto-viewer_branch
=
${HPP_VERSION}
gepetto-viewer_repository
=
${GEPETTO_REPO}
gepetto-viewer_extra_flags
=
-DPYTHON_EXECUTABLE
=
/usr/bin/python3
ifeq
(${QT_VERSION}, 5)
gepetto-viewer_extra_flags
=
-DPYTHON_EXECUTABLE
=
/usr/bin/python3
-DPROJECT_USE_QT4
=
OFF
else
gepetto-viewer_extra_flags
=
-DPYTHON_EXECUTABLE
=
/usr/bin/python3
-DPROJECT_USE_QT4
=
ON
endif
gepetto-viewer-corba_branch
=
${HPP_VERSION}
gepetto-viewer-corba_repository
=
${GEPETTO_REPO}
...
...
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