Merge branch '2.4'
This commit is contained in:
commit
2da99bd264
|
@ -27,6 +27,8 @@ Depends:
|
|||
qml-module-qtqml-models2,
|
||||
qml-module-qtquick-controls,
|
||||
qml-module-qtquick-dialogs,
|
||||
qml-module-qt-labs-settings,
|
||||
qml-module-qt-labs-folderlistmodel,
|
||||
Recommends:
|
||||
cura-resources-firmware,
|
||||
cura-plugins-all,
|
||||
|
@ -106,6 +108,7 @@ Depends:
|
|||
${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
${python3:Depends},
|
||||
python3-zeroconf,
|
||||
Provides:
|
||||
${python3:Provides},
|
||||
cura-extra-plugin-um3networkprinting,
|
||||
|
|
|
@ -23,6 +23,7 @@ override_dh_auto_configure:
|
|||
-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
|
||||
-DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
|
||||
-DPYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$${PYX}m.so \
|
||||
-DPYTHON_SITE_PACKAGES_DIR:FILEPATH=/usr/lib/python$${PYX}/dist-packages \
|
||||
-DPYTHON_INCLUDE_DIR:FILEPATH=/usr/include/python$${PYX}m \
|
||||
-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python$${PYX} ; \
|
||||
done
|
||||
|
@ -37,6 +38,7 @@ override_dh_auto_configure:
|
|||
-DCMAKE_INSTALL_LIBDIR=/usr/lib/debug/lib/$(DEB_HOST_MULTIARCH) \
|
||||
-DPYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$${PYX}m.so \
|
||||
-DPYTHON_DEBUG_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$${PYX}dm.so \
|
||||
-DPYTHON_SITE_PACKAGES_DIR:FILEPATH=/usr/lib/python$${PYX}/dist-packages \
|
||||
-DPYTHON_INCLUDE_DIR:FILEPATH=/usr/include/python$${PYX}dm \
|
||||
-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python$${PYX}dm ; \
|
||||
done
|
||||
|
|
Loading…
Reference in New Issue