diff --git a/hpp-gui/depend.mk b/hpp-gui/depend.mk index 75e6b81424bd7d7b1d7875d5a3a7e799f26b0d77..dbf800858fe8a36b4d7dd50128fb957c9b60e59a 100644 --- a/hpp-gui/depend.mk +++ b/hpp-gui/depend.mk @@ -15,7 +15,11 @@ PREFER.hpp-gui?= robotpkg DEPEND_USE+= hpp-gui -DEPEND_ABI.hpp-gui?= hpp-gui>=4.3.0 +# depend on appropriate Qt version when using Qt, all versions otherwise. +_hppg_qts={qt4,qt5} +_hppg_qt=$(if $(filter qt,${PKG_ALTERNATIVES}),${PKG_ALTERNATIVE.qt},${_hppg_qts}) + +DEPEND_ABI.hpp-gui?= ${_hppg_qt}-hpp-gui>=4.3.0 DEPEND_DIR.hpp-gui?= ../../wip/hpp-gui SYSTEM_SEARCH.hpp-gui=\ diff --git a/hpp-plot/depend.mk b/hpp-plot/depend.mk index f0c5b8199b9a7f3edc6f04b9e71615d103d9b538..ba5f902885d6501550005c2bc21a1a9fff81e630 100644 --- a/hpp-plot/depend.mk +++ b/hpp-plot/depend.mk @@ -15,7 +15,11 @@ PREFER.hpp-plot?= robotpkg DEPEND_USE+= hpp-plot -DEPEND_ABI.hpp-plot?= hpp-plot>=4.3.0 +# depend on appropriate Qt version when using Qt, all versions otherwise. +_hppp_qts={qt4,qt5} +_hppp_qt=$(if $(filter qt,${PKG_ALTERNATIVES}),${PKG_ALTERNATIVE.qt},${_hppp_qts}) + +DEPEND_ABI.hpp-plot?= ${hppp_qt}-hpp-plot>=4.3.0 DEPEND_DIR.hpp-plot?= ../../wip/hpp-plot SYSTEM_SEARCH.hpp-plot=\ diff --git a/qgv/depend.mk b/qgv/depend.mk index 62bd0d11758998838666f4f5d6f6487b54b8ccd7..03f20c98bf6716a3371909884b55b194c1614975 100644 --- a/qgv/depend.mk +++ b/qgv/depend.mk @@ -21,7 +21,11 @@ SYSTEM_SEARCH.qgv=\ DEPEND_USE+= qgv -DEPEND_ABI.qgv?= qgv>=1.1.0 +# depend on appropriate Qt version when using Qt, all versions otherwise. +_qgv_qts={qt4,qt5} +_qgv_qt=$(if $(filter qt,${PKG_ALTERNATIVES}),${PKG_ALTERNATIVE.qt},${_qgv_qts}) + +DEPEND_ABI.qgv?= ${_qgv_qt}-qgv>=1.1.0 DEPEND_DIR.qgv?= ../../wip/qgv endif # QGV_DEPEND_MK ------------------------------------------------