diff options
| author | Jayesh Badwaik <jayeshbadwaik@users.noreply.github.com> | 2018-11-27 01:52:11 +0100 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-11-26 16:52:11 -0800 |
| commit | d562441fc96e160444cf476351b986bd410e5a2b (patch) | |
| tree | 50b9f66bdc983f0a2ead9606a20e368dbad8a204 /scripts | |
| parent | 8361d177d7bfcd03b4117184483e783f22341d9a (diff) | |
| download | vcpkg-d562441fc96e160444cf476351b986bd410e5a2b.tar.gz vcpkg-d562441fc96e160444cf476351b986bd410e5a2b.zip | |
[xmsh] add support for xmsh library (#4656)
* [xmsh] add support for xmsh library
- xmsh is a mesh document format. xmsh library is the reference
implementation for the format.
* [xmsh] removed extraneous file command
* [xmsh] update version to v0.2.3
* [xmsh] upgrade to version v0.3.1
* [xmsh] update to version v0.4
* + fix python executable packaging
* [vcpkg_find_acquire_program] Fix PYTHON3 on non-Windows
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 1ff2ab071..ebe46b335 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -77,12 +77,18 @@ function(vcpkg_find_acquire_program VAR) set(NOEXTRACT ON) set(HASH c1945669d983b632a10c5ff31e86d6ecbff143c3d8b2c433c0d3d18f84356d2b351f71ac05fd44e5403651b00c31db0d14615d7f9a6ecce5750438d37105c55b) elseif(VAR MATCHES "PYTHON3") - set(PROGNAME python) - set(SUBDIR "python3") - set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) - set(URL "https://www.python.org/ftp/python/3.5.4/python-3.5.4-embed-win32.zip") - set(ARCHIVE "python-3.5.4-embed-win32.zip") - set(HASH b5240fdc95088c2d7f65d2dd598650f8dd106b49589d94156bd4a078b108c6cabbe7a38ef73e2b2cf00e8312a93d2e587eac2c54ce85540d3c7a26cc60013156) + if(CMAKE_HOST_WIN32) + set(PROGNAME python) + set(SUBDIR "python3") + set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) + set(URL "https://www.python.org/ftp/python/3.5.4/python-3.5.4-embed-win32.zip") + set(ARCHIVE "python-3.5.4-embed-win32.zip") + set(HASH b5240fdc95088c2d7f65d2dd598650f8dd106b49589d94156bd4a078b108c6cabbe7a38ef73e2b2cf00e8312a93d2e587eac2c54ce85540d3c7a26cc60013156) + else() + set(PROGNAME python3) + set(BREW_PACKAGE_NAME "python") + set(APT_PACKAGE_NAME "python3") + endif() elseif(VAR MATCHES "PYTHON2") set(PROGNAME python) set(SUBDIR "python2") |