mirror of
https://github.com/lucaspalomodevelop/meshlab.git
synced 2026-03-13 00:07:24 +00:00
remove download libraries from scripts
This commit is contained in:
parent
90c6628c50
commit
2d555e7744
10
.github/workflows/CreateRelease.yml
vendored
10
.github/workflows/CreateRelease.yml
vendored
@ -48,7 +48,7 @@ jobs:
|
||||
version: ${{ env.QT_VERSION }}
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
bash scripts/${{ runner.os }}/0_setup_env_ubuntu.sh --dont_install_qt --dowload_cgal_and_boost_src
|
||||
bash scripts/${{ runner.os }}/0_setup_env_ubuntu.sh --dont_install_qt --dont_install_cgal_and_boost
|
||||
#needed by qt 5.15 on linux
|
||||
sudo apt-get install libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-render-util0-dev libxcb-xinerama0-dev
|
||||
- name: Setup env variables
|
||||
@ -181,19 +181,11 @@ jobs:
|
||||
echo "artifact_suffix=" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
echo "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC" >> $GITHUB_ENV
|
||||
- name: Install wget
|
||||
run: |
|
||||
$env:PATH = "${{ env.PATH }};C:\msys64\mingw64\bin;C:\msys64\usr\bin"
|
||||
pacman.exe -S --noconfirm --noprogressbar wget unzip
|
||||
- name: Set Certificate
|
||||
run: |
|
||||
New-Item -ItemType directory -Path certificate
|
||||
Set-Content -Path certificate\certificate.txt -Value '${{ secrets.WIN_CERTIFICATE }}'
|
||||
certutil -decode certificate\certificate.txt certificate\certificate.pfx
|
||||
- name: Download external libraries
|
||||
shell: C:\shells\msys2bash.cmd {0}
|
||||
run: |
|
||||
bash scripts/${{ runner.os }}/0_download_ext.sh
|
||||
- name: Configure and Build
|
||||
shell: bash
|
||||
run: |
|
||||
|
||||
2
.github/workflows/Linux.yml
vendored
2
.github/workflows/Linux.yml
vendored
@ -25,7 +25,7 @@ jobs:
|
||||
version: ${{ env.QT_VERSION }}
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
bash scripts/${{ runner.os }}/0_setup_env_ubuntu.sh --dont_install_qt --dowload_cgal_and_boost_src
|
||||
bash scripts/${{ runner.os }}/0_setup_env_ubuntu.sh --dont_install_qt --dont_install_cgal_and_boost
|
||||
#needed by qt 5.15 on linux
|
||||
sudo apt-get install libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-render-util0-dev libxcb-xinerama0-dev
|
||||
- name: Setup env variables
|
||||
|
||||
8
.github/workflows/Windows.yml
vendored
8
.github/workflows/Windows.yml
vendored
@ -34,14 +34,6 @@ jobs:
|
||||
echo "artifact_suffix=" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
echo "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC" >> $GITHUB_ENV
|
||||
- name: Install wget
|
||||
run: |
|
||||
$env:PATH = "${{ env.PATH }};C:\msys64\mingw64\bin;C:\msys64\usr\bin"
|
||||
pacman.exe -S --noconfirm --noprogressbar wget unzip
|
||||
- name: Download external libraries
|
||||
shell: C:\shells\msys2bash.cmd {0}
|
||||
run: |
|
||||
bash scripts/${{ runner.os }}/0_download_ext.sh
|
||||
- name: Ccache
|
||||
uses: hendrikmuhs/ccache-action@v1.2
|
||||
with:
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# Run this script if you never installed any of the MeshLab dependencies.
|
||||
|
||||
DONT_INSTALL_QT=false
|
||||
DOWNLOAD_CGAL_BOOST_SRC=false
|
||||
DONT_INSTALL_CGAL_BOOST=false
|
||||
|
||||
#checking for parameters
|
||||
for i in "$@"
|
||||
@ -15,8 +15,8 @@ case $i in
|
||||
DONT_INSTALL_QT=true
|
||||
shift # past argument=value
|
||||
;;
|
||||
--dowload_cgal_and_boost_src)
|
||||
DOWNLOAD_CGAL_BOOST_SRC=true
|
||||
--dont_install_cgal_and_boost)
|
||||
DONT_INSTALL_CGAL_BOOST=true
|
||||
shift # past argument=value
|
||||
;;
|
||||
*)
|
||||
@ -40,22 +40,9 @@ echo "=== installing cmake, patchelf, gmp, mpfr and xcerces-c..."
|
||||
sudo apt-get install -y cmake patchelf libgmp-dev libmpfr-dev libxerces-c-dev
|
||||
|
||||
# possibility to use always system libraries starting from ubuntu 20.04, since cgal is header only
|
||||
if [ "$DOWNLOAD_CGAL_BOOST_SRC" = false ] ; then
|
||||
if [ "$DONT_INSTALL_CGAL_BOOST" = false ] ; then
|
||||
echo "=== installing cgal and boost..."
|
||||
sudo apt-get install -y libcgal-dev libboost-all-dev
|
||||
else
|
||||
echo "=== downloading cgal and boost sources..."
|
||||
#default paths wrt the script folder
|
||||
SCRIPTS_PATH="$(dirname "$(realpath "$0")")"
|
||||
EXTERNAL_PATH=$SCRIPTS_PATH/../../src/external
|
||||
|
||||
cd $EXTERNAL_PATH
|
||||
|
||||
wget https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.zip
|
||||
unzip boost_1_75_0.zip
|
||||
rm boost_1_75_0.zip
|
||||
|
||||
wget https://github.com/CGAL/cgal/releases/download/v5.2.1/CGAL-5.2.1.zip
|
||||
unzip CGAL-5.2.1.zip
|
||||
rm CGAL-5.2.1.zip
|
||||
echo "=== jumping installation of cgal and boost packages..."
|
||||
fi
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
$DIR = Get-Location
|
||||
|
||||
#default paths wrt the script folder
|
||||
$SCRIPTS_PATH = $PSScriptRoot
|
||||
$EXTERNAL_PATH = Join-Path $SCRIPTS_PATH ..\..\src\external
|
||||
|
||||
cd $EXTERNAL_PATH
|
||||
|
||||
#going back to original location
|
||||
cd $DIR
|
||||
@ -1,7 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
#default paths wrt the script folder
|
||||
SCRIPTS_PATH="$(dirname "$(realpath "$0")")"
|
||||
EXTERNAL_PATH=$SCRIPTS_PATH/../../src/external
|
||||
|
||||
cd $EXTERNAL_PATH
|
||||
Loading…
x
Reference in New Issue
Block a user