From d24ca043c5390a1f9901fac25c779f679b681b98 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Nov 2021 20:56:40 +0100 Subject: [PATCH] [minitrace] fix cmake config (#21136) --- ports/minitrace/portfile.cmake | 16 ++++++++-------- ports/minitrace/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/m-/minitrace.json | 5 +++++ 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/ports/minitrace/portfile.cmake b/ports/minitrace/portfile.cmake index 444ae31889..06b43396e6 100644 --- a/ports/minitrace/portfile.cmake +++ b/ports/minitrace/portfile.cmake @@ -8,17 +8,17 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/minitrace RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/minitrace" RENAME copyright) diff --git a/ports/minitrace/vcpkg.json b/ports/minitrace/vcpkg.json index 47484d35d2..cb27c98a27 100644 --- a/ports/minitrace/vcpkg.json +++ b/ports/minitrace/vcpkg.json @@ -1,6 +1,16 @@ { "name": "minitrace", "version-string": "2019.02.06", - "port-version": 1, - "description": "Simple C/C++ library for producing JSON traces suitable for Chrome's built-in trace viewer." + "port-version": 2, + "description": "Simple C/C++ library for producing JSON traces suitable for Chrome's built-in trace viewer.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 1a7034d35f..2f17dfaf74 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4350,7 +4350,7 @@ }, "minitrace": { "baseline": "2019.02.06", - "port-version": 1 + "port-version": 2 }, "miniupnpc": { "baseline": "2.1", diff --git a/versions/m-/minitrace.json b/versions/m-/minitrace.json index 589fa8bdc0..42a7e6e1cd 100644 --- a/versions/m-/minitrace.json +++ b/versions/m-/minitrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a108afe478661d93adbf6ca758501a543d89f2b1", + "version-string": "2019.02.06", + "port-version": 2 + }, { "git-tree": "673b7749d7e3be0b8f86b2f8452c5f548068add8", "version-string": "2019.02.06",