From 3e42c74f8900eb81de2c62dd4ac758b7464536d5 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Thu, 27 Feb 2020 12:39:22 -0600 Subject: [PATCH 1/4] Install icon to pixmaps, not hicolor. --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 58be6f175..f40ce894f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -355,7 +355,7 @@ 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 ../install/meshlab.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/pixmaps) endif() if(Qt5_windeployqt_EXECUTABLE AND BUILD_WITH_WINDEPLOYQT_POST_BUILD) From b198f4d7b4e7ff82568541194c9302aaa9a7997a Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Thu, 27 Feb 2020 11:35:22 -0600 Subject: [PATCH 2/4] Restore regular meshlab desktop file. Fixes CMake install process. --- install/linux/resources/meshlab.desktop | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 install/linux/resources/meshlab.desktop 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; From 8c0cee1d8cf83ce27b4a96db1cd37669b3e19ad6 Mon Sep 17 00:00:00 2001 From: bartus Date: Tue, 17 Mar 2020 17:45:36 +0100 Subject: [PATCH 3/4] Fix: make desktop shortcut path absolute. --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f40ce894f..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/pixmaps) + 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) From 529c07cb720b9e657a3003254f5b6a721ab80d7b Mon Sep 17 00:00:00 2001 From: bartoszek Date: Sat, 21 Mar 2020 10:21:31 +0100 Subject: [PATCH 4/4] Actions: add cmake install test. --- .github/workflows/CompileUbuntu.yml | 3 +++ 1 file changed, 3 insertions(+) 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 +