diff options
| author | Adam Johnson <AdamJohnso@gmail.com> | 2020-11-20 12:44:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 09:44:51 -0800 |
| commit | 46068e8a37b41a7a0ba4f485a90d88d3a1071f33 (patch) | |
| tree | 41c3fdad552efa9c4cc0d89954690c130d8539e6 /ports/itk | |
| parent | e803bf11296d8e7900dafb41e7b1224778d33dc6 (diff) | |
| download | vcpkg-46068e8a37b41a7a0ba4f485a90d88d3a1071f33.tar.gz vcpkg-46068e8a37b41a7a0ba4f485a90d88d3a1071f33.zip | |
[python3] Upgrade to 3.9.0 (#14510)
* [python3] Bump to 3.8.6.
* [python3] Bump to 3.9.0.
* [itk] Correct python artifact names.
* [pybind11] Update python artifact names.
* [vcpkg_find_acquire_program] Bump PYTHON3 to 3.9.0.
Diffstat (limited to 'ports/itk')
| -rw-r--r-- | ports/itk/portfile.cmake | 20 | ||||
| -rw-r--r-- | ports/itk/vcpkg.json | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index e5cb1383f..c89c65aa5 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -110,17 +110,17 @@ if("python" IN_LIST FEATURES) ) # Due to ITKs internal shenanigans with the variables ...... if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND ADDITIONAL_OPTIONS "-DPython3_LIBRARY_RELEASE:PATH=${CURRENT_INSTALLED_DIR}/lib/python38.lib" - "-DPython3_LIBRARY_DEBUG:PATH=${CURRENT_INSTALLED_DIR}/debug/lib/python38_d.lib" - "-DPython3_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include/python3.8") - list(APPEND OPTIONS_DEBUG "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/python38_d.lib") - list(APPEND OPTIONS_RELEASE "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/python38.lib") + list(APPEND ADDITIONAL_OPTIONS "-DPython3_LIBRARY_RELEASE:PATH=${CURRENT_INSTALLED_DIR}/lib/python39.lib" + "-DPython3_LIBRARY_DEBUG:PATH=${CURRENT_INSTALLED_DIR}/debug/lib/python39_d.lib" + "-DPython3_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include/python3.9") + list(APPEND OPTIONS_DEBUG "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/python39_d.lib") + list(APPEND OPTIONS_RELEASE "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/python39.lib") elseif(VCPKG_TARGET_IS_LINUX) - list(APPEND ADDITIONAL_OPTIONS "-DPython3_LIBRARY_RELEASE:PATH=${CURRENT_INSTALLED_DIR}/lib/libpython38m.a" - "-DPython3_LIBRARY_DEBUG:PATH=${CURRENT_INSTALLED_DIR}/debug/lib/libpython38md.a" - "-DPython3_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include/python3.8m") - list(APPEND OPTIONS_DEBUG "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/libpython38md.a") - list(APPEND OPTIONS_RELEASE "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/libpython38m.a") + list(APPEND ADDITIONAL_OPTIONS "-DPython3_LIBRARY_RELEASE:PATH=${CURRENT_INSTALLED_DIR}/lib/libpython39m.a" + "-DPython3_LIBRARY_DEBUG:PATH=${CURRENT_INSTALLED_DIR}/debug/lib/libpython39md.a" + "-DPython3_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include/python3.9m") + list(APPEND OPTIONS_DEBUG "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/libpython39md.a") + list(APPEND OPTIONS_RELEASE "-DPython3_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/libpython39m.a") elseif(VCPKG_TARGET_IS_OSX) #Need Python3 information on OSX within VCPKG endif() diff --git a/ports/itk/vcpkg.json b/ports/itk/vcpkg.json index 4231c3cdc..24de005c6 100644 --- a/ports/itk/vcpkg.json +++ b/ports/itk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "itk", "version-string": "5.1.0", - "port-version": 3, + "port-version": 4, "description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.", "homepage": "https://github.com/InsightSoftwareConsortium/ITK", "dependencies": [ |