diff options
| author | cskrisz <cskrisztianster@gmail.com> | 2019-07-02 22:47:50 +0200 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-07-02 13:47:50 -0700 |
| commit | 4642a4fc6c4437b7d68294ab4e34d3fe38051244 (patch) | |
| tree | fa64fb8f69a6f94ad922c8220c94a17fe4511838 /ports | |
| parent | f15d52becf620a0b234b4b7735579b5415f8d7b7 (diff) | |
| download | vcpkg-4642a4fc6c4437b7d68294ab4e34d3fe38051244.tar.gz vcpkg-4642a4fc6c4437b7d68294ab4e34d3fe38051244.zip | |
Fix Python3 tool on Windows (#7051)
* Delete python37._pth from python3-embed
* Add version number to SUBDIR
* [open62541] Use Python in version subdir
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/open62541/CONTROL | 2 | ||||
| -rw-r--r-- | ports/open62541/portfile.cmake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ports/open62541/CONTROL b/ports/open62541/CONTROL index ed2224f0f..28bfd2c0b 100644 --- a/ports/open62541/CONTROL +++ b/ports/open62541/CONTROL @@ -1,3 +1,3 @@ Source: open62541 -Version: 0.3.0-1 +Version: 0.3.0-2 Description: open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0. diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake index a8c345eb8..5132fa7f0 100644 --- a/ports/open62541/portfile.cmake +++ b/ports/open62541/portfile.cmake @@ -31,12 +31,14 @@ endif() vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +get_filename_component(PYTHON3_DIR_NAME "${PYTHON3_DIR}" NAME) vcpkg_add_to_path("${PYTHON3_DIR}") + if(NOT EXISTS ${PYTHON3_DIR}/easy_install${EXECUTABLE_SUFFIX}) if(NOT EXISTS ${PYTHON3_DIR}/Scripts/pip${EXECUTABLE_SUFFIX}) vcpkg_download_distfile(GET_PIP URLS "https://bootstrap.pypa.io/get-pip.py" - FILENAME "tools/python/python3/get-pip.py" + FILENAME "tools/python/${PYTHON3_DIR_NAME}/get-pip.py" SHA512 99520d223819708b8f6e4b839d1fa215e4e8adc7fcd0db6c25a0399cf2fa10034b35673cf450609303646d12497f301ef53b7e7cc65c78e7bce4af0c673555ad ) execute_process(COMMAND ${PYTHON3_DIR}/python${EXECUTABLE_SUFFIX} ${PYTHON3_DIR}/get-pip.py) |