diff --git a/.github/workflows/CompileUbuntu.yml b/.github/workflows/CompileUbuntu.yml index eb0b1cde5..7578b7364 100755 --- a/.github/workflows/CompileUbuntu.yml +++ b/.github/workflows/CompileUbuntu.yml @@ -81,3 +81,6 @@ jobs: cmake src/ -G Ninja - name: Build MeshLab run: ninja -C . + - name: Install Meshlab + run: sudo ninja -C . install + diff --git a/install/linux/resources/meshlab.desktop b/install/linux/resources/meshlab.desktop new file mode 100644 index 000000000..44b5a09d7 --- /dev/null +++ b/install/linux/resources/meshlab.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Name=MeshLab +Name[en_GB]=MeshLab +GenericName=Mesh processing +GenericName[en_GB]=Mesh processing +Comment=View and process meshes +Type=Application +Exec=meshlab %F +Icon=/usr/share/pixmaps/meshlab.png +Terminal=false +MimeType=model/mesh;application/x-3ds;image/x-3ds;model/x-ply;application/sla;model/x-quad-object;model/x-geomview-off;application/x-cyclone-ptx;application/x-vmi;application/x-bre;model/vnd.collada+xml;model/openctm;application/x-expe-binary;application/x-expe-ascii;application/x-xyz;application/x-gts;chemical/x-pdb;application/x-tri;application/x-asc;model/x3d+xml;model/x3d+vrml;model/vrml;model/u3d;model/idtf; +Categories=Graphics;3DGraphics;Viewer;Qt; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 58be6f175..82bdb5c1e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -354,8 +354,8 @@ if(INSTALL_SAMPLE_RANGEMAPS) endif() if(NOT WIN32 AND NOT APPLE) - install(FILES ../install/linux/resources/meshlab.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) - install(FILES ../install/meshlab.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor) + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../install/linux/resources/meshlab.desktop" DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../install/meshlab.png" DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/pixmaps) endif() if(Qt5_windeployqt_EXECUTABLE AND BUILD_WITH_WINDEPLOYQT_POST_BUILD)