Skip to content

Commit e6e4bc7

Browse files
authored
[xproperty] update to 0.12.1 (microsoft#47489)
1 parent 0bf2340 commit e6e4bc7

File tree

5 files changed

+14
-42
lines changed

5 files changed

+14
-42
lines changed

ports/xproperty/fix-target.patch

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,13 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 5dcddc2..9d99227 100644
2+
index accd038..2451bf0 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
55
@@ -7,7 +7,7 @@
66
############################################################################
77

8-
cmake_minimum_required(VERSION 3.1)
8+
cmake_minimum_required(VERSION 3.20)
99
-project(xproperty)
1010
+project(xproperty CXX)
1111

1212
set(XPROPERTY_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
1313

14-
@@ -28,7 +28,8 @@ message(STATUS "xproperty v${${PROJECT_NAME}_VERSION}")
15-
# Dependencies
16-
# ============
17-
18-
-find_package(xtl 0.5.3 REQUIRED)
19-
+set(xtl_REQUIRED_VERSION 0.5.3)
20-
+find_package(xtl ${xtl_REQUIRED_VERSION} REQUIRED)
21-
message(STATUS "Found xtl: ${xtl_INCLUDE_DIRS}/xtl")
22-
23-
# Build
24-
diff --git a/xpropertyConfig.cmake.in b/xpropertyConfig.cmake.in
25-
index 192c04f..38b305a 100644
26-
--- a/xpropertyConfig.cmake.in
27-
+++ b/xpropertyConfig.cmake.in
28-
@@ -15,7 +15,12 @@
29-
30-
@PACKAGE_INIT@
31-
32-
-set(PN xproperty)
33-
-set_and_check(${PN}_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@")
34-
-set(${PN}_LIBRARY "")
35-
-check_required_components(${PN})
36-
+include(CMakeFindDependencyMacro)
37-
+find_dependency(xtl @xtl_REQUIRED_VERSION@)
38-
+
39-
+if(NOT TARGET @PROJECT_NAME@)
40-
+ include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
41-
+ get_target_property(@PROJECT_NAME@_INCLUDE_DIR @PROJECT_NAME@ INTERFACE_INCLUDE_DIRECTORIES)
42-
+endif()
43-
+
44-
+set(@PROJECT_NAME@_LIBRARY "")

ports/xproperty/portfile.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
vcpkg_from_github(
44
OUT_SOURCE_PATH SOURCE_PATH
55
REPO QuantStack/xproperty
6-
REF 0.8.1
7-
SHA512 70fcce3a3cc84be98d844aa59c14686945907db3c8fa1c9a916f0bab811ef96512464031e53f00d29cba7db750a0032f4b59d6ca524f52bc7cfe8de5cebad5e5
6+
REF ${VERSION}
7+
SHA512 e070427d75e5f1b7edab67599c9e61eb375b68e683db864ec1758d331bb0fcf8d20051831f69a36db5a2e9efc6eb2822f62f8cc1ed563d728a534c1cbec40d77
88
HEAD_REF master
99
PATCHES
1010
fix-target.patch
@@ -14,7 +14,6 @@ vcpkg_cmake_configure(
1414
SOURCE_PATH "${SOURCE_PATH}"
1515
OPTIONS
1616
-DBUILD_TESTS=OFF
17-
-DDOWNLOAD_GTEST=OFF
1817
)
1918

2019
vcpkg_cmake_install()

ports/xproperty/vcpkg.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
{
22
"name": "xproperty",
3-
"version": "0.8.1",
4-
"port-version": 3,
3+
"version": "0.12.1",
54
"description": "Traitlets-like C++ properties and implementation of the observer pattern",
65
"dependencies": [
6+
"nlohmann-json",
77
{
88
"name": "vcpkg-cmake",
99
"host": true
1010
},
1111
{
1212
"name": "vcpkg-cmake-config",
1313
"host": true
14-
},
15-
"xtl"
14+
}
1615
]
1716
}

versions/baseline.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10565,8 +10565,8 @@
1056510565
"port-version": 0
1056610566
},
1056710567
"xproperty": {
10568-
"baseline": "0.8.1",
10569-
"port-version": 3
10568+
"baseline": "0.12.1",
10569+
"port-version": 0
1057010570
},
1057110571
"xproto": {
1057210572
"baseline": "2021.5",

versions/x-/xproperty.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "53a98275aa99091112fee2461e80e908ff78b68f",
5+
"version": "0.12.1",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "237cd26cda6bc5f75e9dd2d75e5a65725512065d",
510
"version": "0.8.1",

0 commit comments

Comments
 (0)