diff --git a/scripts/Windows/0_download_ext.ps1 b/scripts/Windows/0_download_ext.ps1 new file mode 100644 index 000000000..8dca9be8c --- /dev/null +++ b/scripts/Windows/0_download_ext.ps1 @@ -0,0 +1,22 @@ +$DIR = Get-Location + +#default paths wrt the script folder +$SCRIPTS_PATH = $PSScriptRoot +$EXTERNAL_PATH = Join-Path $SCRIPTS_PATH ..\..\src\external + +cd $EXTERNAL_PATH + +Invoke-WebRequest -Uri "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.zip" -OutFile "boost_1_75_0.zip" +Expand-Archive -Path boost_1_75_0.zip -DestinationPath .\ +Remove-Item boost_1_75_0.zip + +Invoke-WebRequest -Uri "https://github.com/CGAL/cgal/releases/download/v5.2.1/CGAL-5.2.1.zip" -OutFile "CGAL-5.2.1.zip" +Expand-Archive -Path CGAL-5.2.1.zip -DestinationPath .\ +Remove-Item CGAL-5.2.1.zip + +Invoke-WebRequest -Uri "https://github.com/CGAL/cgal/releases/download/v5.2.1/CGAL-5.2.1-win64-auxiliary-libraries-gmp-mpfr.zip" -OutFile "CGAL-5.2.1-win64-auxiliary-libraries-gmp-mpfr.zip" +Expand-Archive -Path CGAL-5.2.1-win64-auxiliary-libraries-gmp-mpfr.zip -DestinationPath .\CGAL-5.2.1\ -Force +Remove-Item CGAL-5.2.1-win64-auxiliary-libraries-gmp-mpfr.zip + +#going back to original location +cd $DIR diff --git a/src/external/cgal.cmake b/src/external/cgal.cmake index 78ae9dda7..cf2f0a7a4 100644 --- a/src/external/cgal.cmake +++ b/src/external/cgal.cmake @@ -31,7 +31,7 @@ elseif(ALLOW_BUNDLED_CGAL AND EXISTS "${CGAL_DIR}/include/CGAL/version.h") target_link_libraries(external-cgal INTERFACE mpfr gmp Threads::Threads) if (WIN32) - if (DEFINED MESHLAB_BUILD_DISTRIB_DIR) + if (DEFINED MESHLAB_LIB_OUTPUT_DIR) file( COPY ${CGAL_DIR}/auxiliary/gmp/lib/libmpfr-4.lib @@ -39,7 +39,7 @@ elseif(ALLOW_BUNDLED_CGAL AND EXISTS "${CGAL_DIR}/include/CGAL/version.h") ${CGAL_DIR}/auxiliary/gmp/lib/libgmp-10.lib ${CGAL_DIR}/auxiliary/gmp/lib/libgmp-10.dll DESTINATION - ${MESHLAB_BUILD_DISTRIB_DIR}) + ${MESHLAB_LIB_OUTPUT_DIR}) endif() if (DEFINED MESHLAB_LIB_INSTALL_DIR) install(