From 5ddd7f02689b7c5aab78711d77f61db5d2e5e79c Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 2 Dec 2021 04:32:09 +0100 Subject: [PATCH] [ginkgo] no absolute paths (#21700) --- ports/ginkgo/portfile.cmake | 7 ++++++- ports/ginkgo/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/ginkgo.json | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ports/ginkgo/portfile.cmake b/ports/ginkgo/portfile.cmake index b2926fa9ae..2faede6d56 100644 --- a/ports/ginkgo/portfile.cmake +++ b/ports/ginkgo/portfile.cmake @@ -22,7 +22,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DGINKGO_BUILD_REFERENCE=ON -DGINKGO_BUILD_TESTS=OFF @@ -42,6 +41,12 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Ginkgo) vcpkg_fixup_pkgconfig() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" [[string(REPLACE "lib/cmake/Ginkgo" "" GINKGO_INSTALL_PREFIX "${GINKGO_CONFIG_FILE_PATH}")]] "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "GINKGO_INSTALL_PREFIX" "_IMPORT_PREFIX") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "/lib/cmake/Ginkgo\"" "/share/ginkgo\"") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "/lib/cmake/Ginkgo/Modules\"" "/share/ginkgo/Modules/Modules\"") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "\"${SOURCE_PATH}/cmake/Modules/\"" "") + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ginkgo" RENAME copyright) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ginkgo") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/ginkgo/vcpkg.json b/ports/ginkgo/vcpkg.json index c7db13df55..426e388afe 100644 --- a/ports/ginkgo/vcpkg.json +++ b/ports/ginkgo/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ginkgo", "version-semver": "1.4.0", + "port-version": 1, "description": "Ginkgo is a high-performance linear algebra library for manycore systems, with a focus on sparse solution of linear systems. Note that the OpenMP feature is not available on Windows.", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index a1ce3c6838..2e84594fe1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2438,7 +2438,7 @@ }, "ginkgo": { "baseline": "1.4.0", - "port-version": 0 + "port-version": 1 }, "gl2ps": { "baseline": "1.4.2", diff --git a/versions/g-/ginkgo.json b/versions/g-/ginkgo.json index d4eb05b736..1c79cf259c 100644 --- a/versions/g-/ginkgo.json +++ b/versions/g-/ginkgo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b8d35300c7b2bd3efcd7e645579df0a9e67d86d", + "version-semver": "1.4.0", + "port-version": 1 + }, { "git-tree": "da56f7ca349bebb4061a04d4d3b3d9b8fde9a1c8", "version-semver": "1.4.0",