From 9cfeb3b011995dedc8b8f0b3be6209d12759edb1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 16 Dec 2024 19:08:38 +0100 Subject: [PATCH] [kf5plotting] fix single config builds (#42725) --- ports/kf5plotting/portfile.cmake | 4 +++- ports/kf5plotting/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/k-/kf5plotting.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index fa6b846a1a0c16..2dc67843df6a05 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -20,7 +20,9 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Plotting CONFIG_PATH lib/cmake/KF5Plott vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}/debug/plugins") +if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}/debug/plugins") +endif() file(RENAME "${CURRENT_PACKAGES_DIR}/lib/plugins" "${CURRENT_PACKAGES_DIR}/plugins") file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") diff --git a/ports/kf5plotting/vcpkg.json b/ports/kf5plotting/vcpkg.json index 56dcca670b5283..13d5bdba7e1611 100644 --- a/ports/kf5plotting/vcpkg.json +++ b/ports/kf5plotting/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5plotting", "version": "5.98.0", + "port-version": 1, "description": "Lightweight plotting framework", "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index efb31a5b200139..40c64afe9c6fd8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4086,7 +4086,7 @@ }, "kf5plotting": { "baseline": "5.98.0", - "port-version": 0 + "port-version": 1 }, "kf5service": { "baseline": "5.98.0", diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json index 1d49856a9e53bc..f934d7e60fc095 100644 --- a/versions/k-/kf5plotting.json +++ b/versions/k-/kf5plotting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d39d137ecaf46182303bb5845c61fc33c485d571", + "version": "5.98.0", + "port-version": 1 + }, { "git-tree": "a242d0a106748fced7dacaf9e6c635bdafa9c289", "version": "5.98.0",