diff options
| author | Adam Johnson <AdamJohnso@gmail.com> | 2021-01-05 16:39:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-05 13:39:53 -0800 |
| commit | 378ffbb940e0a9112f60f837f68db202e2e280bf (patch) | |
| tree | 4794c38aded15ba7c192657cb5ce56100250b6e6 /ports/itk | |
| parent | ebedac7774a1636ea45782a6a9b24a03d45990d0 (diff) | |
| download | vcpkg-378ffbb940e0a9112f60f837f68db202e2e280bf.tar.gz vcpkg-378ffbb940e0a9112f60f837f68db202e2e280bf.zip | |
[python3] Add vcpkg-cmake-wrapper. (#15221)
* [python3] Add vcpkg-cmake-wrapper.cmake.
This is still a WIP... For now, we only remove registry detection on
Windows.
* [python3] Fix Windows static embedding linkage.
* [python3] Fix Linux static library embedding.
* [python3] Fix linkage on macOS.
* [python3] Only link extra libs when static.
* [python3] Bump port version for vcpkg-cmake-wrapper.
* [itk] Remove obsolete Python artifact specification.
* [pybind11] Remove obsolete Python artifact specification.
* [python3] Mark `find_package()` calls as REQUIRED.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* [python3] Bump port version after #15378.
* [python3] Be more selective about when to unleash the nukes.
* [python3] Add usage message.
* [python3] Don't swallow `vcpkg_find_acquire_program`'s Python3.
* [python3] Don't forcibly change the registry find state.
* [python3] fix copypasta error
* [python3] Fix config error with the opensubdiv port.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/itk')
| -rw-r--r-- | ports/itk/portfile.cmake | 16 | ||||
| -rw-r--r-- | ports/itk/vcpkg.json | 2 |
2 files changed, 1 insertions, 17 deletions
diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index c89c65aa5..8961379a5 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -108,22 +108,6 @@ if("python" IN_LIST FEATURES) "-DSWIG_EXECUTABLE=${SWIG}" "-DSWIG_DIR=${SWIG_DIR}" ) - # 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/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/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() #ITK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages within vcpkg endif() diff --git a/ports/itk/vcpkg.json b/ports/itk/vcpkg.json index 24de005c6..394b45afb 100644 --- a/ports/itk/vcpkg.json +++ b/ports/itk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "itk", "version-string": "5.1.0", - "port-version": 4, + "port-version": 5, "description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.", "homepage": "https://github.com/InsightSoftwareConsortium/ITK", "dependencies": [ |