Skip to content
GitLab
Unverified Commit 9abe4b28 authored by Joseph Mirabel's avatar Joseph Mirabel Committed by GitHub
Browse files

Merge pull request #58 from DianeBury/devel 

[Makefile] Add extra flag for gepetto-viewer for Qt5
parents 8237d0b2 bf529799
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}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment