diff options
| author | aggieNick02 <nick@pcpartpicker.com> | 2021-07-16 02:14:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-16 00:14:27 -0700 |
| commit | aee68688c3882009d1caafa444bbf49aa7978ac2 (patch) | |
| tree | 72df9f465e818128dfb4131bdd1d9297f00b465c | |
| parent | e43557e6652f0c7713e5a6f07fd7d5ac6153f580 (diff) | |
| download | vcpkg-aee68688c3882009d1caafa444bbf49aa7978ac2.tar.gz vcpkg-aee68688c3882009d1caafa444bbf49aa7978ac2.zip | |
[presentmon] Update presentmon port from 1.6.0 release to 1.7.0 (#18234)
* update presentmon to 1.7.0 release
* Commit running of x-add-version for presentmon port update
* fixes for presentmon port
* rerun x-add-version
| -rw-r--r-- | ports/presentmon/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ports/presentmon/portfile.cmake | 9 | ||||
| -rw-r--r-- | ports/presentmon/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/p-/presentmon.json | 5 |
5 files changed, 13 insertions, 11 deletions
diff --git a/ports/presentmon/CMakeLists.txt b/ports/presentmon/CMakeLists.txt index d1ff455fc..1c8bd8620 100644 --- a/ports/presentmon/CMakeLists.txt +++ b/ports/presentmon/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 3.11) project(presentmon) -set(PRESENTMON_VERSION 1.6.0) - option(INSTALL_HEADERS "Install presentmon headers" ON) option(BUILD_TOOLS "Build tool PresentMon" OFF) @@ -26,7 +24,7 @@ set(PRESENTDATA_HDRS file(GLOB EXTRA_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/PresentData/ETW/*.h) -file(WRITE ${CMAKE_BINARY_DIR}/generated/version.h "char const* PRESENT_MON_VERSION = \"1.6.0\";") +file(WRITE ${CMAKE_BINARY_DIR}/generated/version.h "char const* PRESENT_MON_VERSION = \"1.7.0\";") add_library(PresentData STATIC ${PRESENTDATA_SRCS} ${PRESENTDATA_HDRS} ${EXTRA_INCLUDES}) @@ -70,4 +68,4 @@ endif() if (INSTALL_HEADERS) install(FILES ${PRESENTDATA_HDRS} DESTINATION include/presentmon) install(FILES ${EXTRA_INCLUDES} DESTINATION include/presentmon/ETW) -endif()
\ No newline at end of file +endif() diff --git a/ports/presentmon/portfile.cmake b/ports/presentmon/portfile.cmake index dd55cad5c..b6a00824b 100644 --- a/ports/presentmon/portfile.cmake +++ b/ports/presentmon/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_fail_port_install(ON_TARGET "linux" "osx" "uwp" "ios" "android" "freebsd") -set(PRESENTMON_VERSION 1.6.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GameTechDev/PresentMon - REF 6ddc9e15d2ef169cdce954b589c1ba190b3a25bd # 1.6.0 - SHA512 2522b0e3218d4a6588531a09bc82631f14ad05c20f4560fe0574f00f2f5eece114ae04320f920eb52ba64173cea5cdf15bb223b7395c3782e4a6465afb5d9bec + REF 47669ad0efaddc9787772d5e4900734417b2c07c # 1.7.0 + SHA512 fac2e2ca4d8476e2cdde7c3f77cf1881b7d7a9208387f12dbf07f3ea7f4012ce79602f4fedbf1e778871fd9ce898b101659a6f192de29dc6a4404213aee444be HEAD_REF main ) @@ -16,7 +15,7 @@ file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - tools BUILD_TOOLS + tools BUILD_TOOLS ) vcpkg_configure_cmake( @@ -33,4 +32,4 @@ if("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES presentmon AUTO_CLEAN) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/presentmon/vcpkg.json b/ports/presentmon/vcpkg.json index 427249ea0..b4e05670c 100644 --- a/ports/presentmon/vcpkg.json +++ b/ports/presentmon/vcpkg.json @@ -1,6 +1,6 @@ { "name": "presentmon", - "version-string": "1.6.0", + "version-semver": "1.7.0", "description": "PresentMon is a tool to capture and analyze ETW events related to swap chain presentation on Windows.", "supports": "windows & !uwp", "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 8a7bb218d..2a19c0fc7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4985,7 +4985,7 @@ "port-version": 0 }, "presentmon": { - "baseline": "1.6.0", + "baseline": "1.7.0", "port-version": 0 }, "proj": { diff --git a/versions/p-/presentmon.json b/versions/p-/presentmon.json index 185037fbd..5c83b268f 100644 --- a/versions/p-/presentmon.json +++ b/versions/p-/presentmon.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "0d57616105f23dbcceb4477bb30354e0d3e4a5b6", + "version-semver": "1.7.0", + "port-version": 0 + }, + { "git-tree": "581eeeb1e8761811f3393a6cd0e4041609b162d0", "version-string": "1.6.0", "port-version": 0 |