diff options
| author | Adam Johnson <AdamJohnso@gmail.com> | 2020-10-23 03:29:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-23 00:29:35 -0700 |
| commit | 50a596c40a07afc7588f12f86f276581a60cba94 (patch) | |
| tree | 0e8900ea3876d7b772da4634a11b8457baaf609c /scripts | |
| parent | ba2e63548f385309159dce0251635d9490dc8df1 (diff) | |
| download | vcpkg-50a596c40a07afc7588f12f86f276581a60cba94.tar.gz vcpkg-50a596c40a07afc7588f12f86f276581a60cba94.zip | |
[vcpkg_find_acquire_program] Fix SWIG on non-Windows platforms. (#13953)
Previously, the sourceforge downloader was attempting to download a
mixture of the Windows URL with an incorrect extension, causing a
cascade of HTTPS download failure messages.
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index ea5b0d6ec..148b15ea8 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -354,32 +354,23 @@ function(vcpkg_find_acquire_program VAR) set(ARCHIVE "scons-local-${SCONS_VERSION}.zip") set(HASH fe121b67b979a4e9580c7f62cfdbe0c243eba62a05b560d6d513ac7f35816d439b26d92fc2d7b7d7241c9ce2a49ea7949455a17587ef53c04a5f5125ac635727) elseif(VAR MATCHES "SWIG") - set(VERSION 4.0.2) + set(SWIG_VERSION 4.0.2) set(PROGNAME swig) if(CMAKE_HOST_WIN32) - #set(URL "https://sourceforge.net/projects/swig/files/swigwin/swigwin-${VERSION}/swigwin-${VERSION}.zip/download") - set(ARCHIVE "swigwin-${VERSION}.zip") - set(HASH b8f105f9b9db6acc1f6e3741990915b533cd1bc206eb9645fd6836457fd30789b7229d2e3219d8e35f2390605ade0fbca493ae162ec3b4bc4e428b57155db03d) - set(SUBDIR b8f105f9b9-f0518bc3b7/swigwin-${VERSION}) - #set(SUBDIR "swigwin-${VERSION}") - #set(PATHS "${DOWNLOADS}/tools/swig/swigwin-${VERSION}") - else() - #Not used - set(_vfa_SUPPORTED TRUE) - set(URL https://sourceforge.net/projects/swig/files/swig/swig-${VERSION}/swig-${VERSION}.tar.gz/download) - set(ARCHIVE "swig-${VERSION}.tar.gz") - set(HASH 05e7da70ce6d9a733b96c0bcfa3c1b82765bd859f48c74759bbf4bb1467acb1809caa310cba5e2b3280cd704fca249eaa0624821dffae1d2a75097c7f55d14ed) - set(SUBDIR "swig-${VERSION}") - set(PATHS "${DOWNLOADS}/tools/swig/${SUBDIR}") - endif() - set(SOURCEFORGE_ARGS + set(SOURCEFORGE_ARGS REPO swig/swigwin - REF swigwin-${VERSION} - FILENAME "${ARCHIVE}" - SHA512 "${HASH}" + REF swigwin-${SWIG_VERSION} + FILENAME "swigwin-${SWIG_VERSION}.zip" + SHA512 b8f105f9b9db6acc1f6e3741990915b533cd1bc206eb9645fd6836457fd30789b7229d2e3219d8e35f2390605ade0fbca493ae162ec3b4bc4e428b57155db03d NO_REMOVE_ONE_LEVEL WORKING_DIRECTORY "${DOWNLOADS}/tools/swig" - ) + ) + set(SUBDIR b8f105f9b9-f0518bc3b7/swigwin-${SWIG_VERSION}) + else() + set(APT_PACKAGE_NAME "swig") + set(BREW_PACKAGE_NAME "swig") + endif() + elseif(VAR MATCHES "DOXYGEN") set(PROGNAME doxygen) set(DOXYGEN_VERSION 1.8.17) |