Commit 69f8cbe6 authored by Guilhem Saurel's avatar 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
...@@ -211,9 +211,9 @@ gepetto-viewer_repository=${GEPETTO_REPO} ...@@ -211,9 +211,9 @@ gepetto-viewer_repository=${GEPETTO_REPO}
gepetto-viewer-corba_branch=devel gepetto-viewer-corba_branch=devel
gepetto-viewer-corba_repository=${GEPETTO_REPO} gepetto-viewer-corba_repository=${GEPETTO_REPO}
ifeq (${QT_VERSION}, 5) ifeq (${QT_VERSION}, 5)
gepetto-viewer-corba_extra_flags= -DUSE_QT4=OFF gepetto-viewer_extra_flags= -DPROJECT_USE_QT4=OFF
else else
gepetto-viewer-corba_extra_flags= -DUSE_QT4=ON gepetto-viewer_extra_flags= -DPROJECT_USE_QT4=ON
endif endif
pythonqt_branch=qt${QT_VERSION} pythonqt_branch=qt${QT_VERSION}
...@@ -315,7 +315,7 @@ osg-dae.configure.dep: collada-dom.install \ ...@@ -315,7 +315,7 @@ osg-dae.configure.dep: collada-dom.install \
osg-dae.checkout osg-dae.checkout
OpenSceneGraph-3.4.0.configure.dep: collada-dom.install \ OpenSceneGraph-3.4.0.configure.dep: collada-dom.install \
OpenSceneGraph-3.4.0.checkout 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 \ gepetto-viewer-corba.configure.dep: gepetto-viewer.install \
pythonqt.install gepetto-viewer-corba.checkout pythonqt.install gepetto-viewer-corba.checkout
hpp-gepetto-viewer.configure.dep: gepetto-viewer-corba.install \ hpp-gepetto-viewer.configure.dep: gepetto-viewer-corba.install \
......
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