From efdc09121456bc4a5f96a71cbef4a41fb0100bd0 Mon Sep 17 00:00:00 2001 From: Kai Blaschke Date: Tue, 17 Sep 2024 20:46:56 +0200 Subject: [PATCH] [projectm-eval] Fix/add "ns-eel2" feature (#40759) --- ports/projectm-eval/portfile.cmake | 10 ++++++++-- ports/projectm-eval/usage | 5 +++++ ports/projectm-eval/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/projectm-eval.json | 5 +++++ 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ports/projectm-eval/portfile.cmake b/ports/projectm-eval/portfile.cmake index e5a8aae11f..7370e77e94 100644 --- a/ports/projectm-eval/portfile.cmake +++ b/ports/projectm-eval/portfile.cmake @@ -17,8 +17,14 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup( - PACKAGE_NAME "projectm-eval" - CONFIG_PATH "lib/cmake/projectM-Eval" + PACKAGE_NAME "projectm-eval" + CONFIG_PATH "lib/cmake/projectM-Eval" + DO_NOT_DELETE_PARENT_CONFIG_PATH +) + +vcpkg_cmake_config_fixup( + PACKAGE_NAME "projectM-EvalMilkdrop" + CONFIG_PATH "lib/cmake/projectM-EvalMilkdrop" ) vcpkg_fixup_pkgconfig() diff --git a/ports/projectm-eval/usage b/ports/projectm-eval/usage index e7947ff8da..f1fcdb8466 100644 --- a/ports/projectm-eval/usage +++ b/ports/projectm-eval/usage @@ -2,3 +2,8 @@ projectm-eval provides CMake targets: find_package(projectM-Eval REQUIRED) target_link_libraries(main PRIVATE projectM::Eval) + +To use the ns-eel2 shim with the Milkdrop codebase: + + find_package(projectM-Eval REQUIRED COMPONENTS Milkdrop) + target_link_libraries(main PRIVATE projectM::ns-eel2) diff --git a/ports/projectm-eval/vcpkg.json b/ports/projectm-eval/vcpkg.json index 932ea1f506..4647a47a0b 100644 --- a/ports/projectm-eval/vcpkg.json +++ b/ports/projectm-eval/vcpkg.json @@ -1,6 +1,7 @@ { "name": "projectm-eval", "version": "1.0.0", + "port-version": 1, "description": "The projectM Expression Evaluation Library. A portable drop-in replacement of Milkdrop's \"ns-eel2\" expression parser for use in Milkdrop, projectM and other applications.", "homepage": "https://github.com/projectM-visualizer/projectm-eval", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 50bcbc8d8f..56a0b879db 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7142,7 +7142,7 @@ }, "projectm-eval": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "prometheus-cpp": { "baseline": "1.2.4", diff --git a/versions/p-/projectm-eval.json b/versions/p-/projectm-eval.json index 65a6ddbb7c..75b2ed2c50 100644 --- a/versions/p-/projectm-eval.json +++ b/versions/p-/projectm-eval.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c21e929bb3f98383e81a4821e0aa8b2cb1413f88", + "version": "1.0.0", + "port-version": 1 + }, { "git-tree": "3c32881926b002ddd0fa05b351774ebe69f81fa1", "version": "1.0.0",