diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml index 4f43077f2..9ff68ddeb 100644 --- a/.github/workflows/CreateRelease.yml +++ b/.github/workflows/CreateRelease.yml @@ -109,7 +109,7 @@ jobs: submodules: true - name: Install dependencies run: | - brew install libomp + brew install libomp xerces-c npm install -g appdmg - name: Install Qt uses: jurplel/install-qt-action@v2 diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml index 3776f8105..396dd8386 100644 --- a/.github/workflows/MacOS.yml +++ b/.github/workflows/MacOS.yml @@ -17,7 +17,7 @@ jobs: submodules: true - name: Install dependencies run: | - brew install libomp + brew install libomp xerces-c npm install -g appdmg - name: Install Qt uses: jurplel/install-qt-action@v2 diff --git a/.gitignore b/.gitignore index 47f65c5ce..c2b4b17fb 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ *.AppImage .DS_Store distrib* +src/build/* src/install/* install/macos/resources/meshlab_dmg_final.json install/windows/resources/meshlab_final.nsi @@ -95,7 +96,7 @@ target_wrapper.* # QtCreator CMake CMakeLists.txt.user* -# QtCreator 4.8< compilation database +# QtCreator 4.8< compilation database compile_commands.json # QtCreator local machine specific files for imported projects