From c64831df95b3bd28ebd87e0f95becfcf77edb15d Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 9 Jan 2023 06:34:52 +0100 Subject: [PATCH] [itk] no absolute paths (#28790) --- ports/itk/portfile.cmake | 8 ++++++++ ports/itk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/itk.json | 5 +++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index 65057293f1..459e1af0ec 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -204,4 +204,12 @@ file(REMOVE "${CURRENT_PACKAGES_DIR}/include/ITK-5.3/vcl_where_root_dir.h") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.3/itk_eigen.h" "include(${SOURCE_PATH}/CMake/UseITK.cmake)" "include(UseITK)") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.3/itk_eigen.h" "message(STATUS \"From ITK: Eigen3_DIR: ${CURRENT_INSTALLED_DIR}/share/eigen3\")" "") +if("rtk" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.3/rtkConfiguration.h" "#define RTK_BINARY_DIR \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Modules/Remote/RTK\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.3/rtkConfiguration.h" "#define RTK_DATA_ROOT \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/ExternalData/Modules/Remote/RTK/test\"" "") + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/itk/Modules/RTK.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "\${ITK_INSTALL_PREFIX}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/itk/Modules/RTK.cmake" "${SOURCE_PATH}/Modules/Remote/RTK/utilities/lp_solve" "\${ITK_INSTALL_PREFIX}/include/RTK/lpsolve") +endif() + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/itk/vcpkg.json b/ports/itk/vcpkg.json index d6fdd6a90d..14cc6f912d 100644 --- a/ports/itk/vcpkg.json +++ b/ports/itk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "itk", "version": "5.2.1", - "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", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 186f4c1c02..52f8ae3106 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3194,7 +3194,7 @@ }, "itk": { "baseline": "5.2.1", - "port-version": 3 + "port-version": 4 }, "itpp": { "baseline": "4.3.1", diff --git a/versions/i-/itk.json b/versions/i-/itk.json index ecc09cae81..8526fd87bb 100644 --- a/versions/i-/itk.json +++ b/versions/i-/itk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b28c11dddebdeb5084e068f2ad88e87b777f5edb", + "version": "5.2.1", + "port-version": 4 + }, { "git-tree": "a3904d4a80201635e6687ff2b5ca5d677b559874", "version": "5.2.1",