Skip to content

Commit a9ebf22

Browse files
authored
[tmxlite] update to 1.4.5 (#50523)
1 parent 55067f1 commit a9ebf22

5 files changed

Lines changed: 29 additions & 24 deletions

File tree

ports/tmxlite/dependencies.patch

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
diff --git a/tmxlite/CMakeLists.txt b/tmxlite/CMakeLists.txt
2-
index a1b1882..8c0aad6 100644
2+
index 1a1e05b..cae012b 100644
33
--- a/tmxlite/CMakeLists.txt
44
+++ b/tmxlite/CMakeLists.txt
5-
@@ -68,10 +68,9 @@ if(USE_EXTLIBS)
6-
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
7-
8-
find_package(ZLIB REQUIRED)
9-
- find_package(PUGIXML REQUIRED)
10-
- find_package(Zstd REQUIRED)
11-
+ find_package(pugixml CONFIG REQUIRED)
12-
+ find_package(zstd CONFIG REQUIRED)
13-
14-
- include_directories(${ZLIB_INCLUDE_DIRS} ${PUGIXML_INCLUDE_DIR} ${ZSTD_INCLUDE_DIR})
15-
5+
@@ -70,10 +70,9 @@ if(USE_EXTLIBS)
6+
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
7+
8+
find_package(ZLIB REQUIRED)
9+
- find_package(PUGIXML REQUIRED)
10+
- find_package(Zstd REQUIRED)
11+
+ find_package(pugixml CONFIG REQUIRED)
12+
+ find_package(zstd CONFIG REQUIRED)
13+
14+
- include_directories(${ZLIB_INCLUDE_DIRS} ${PUGIXML_INCLUDE_DIR} ${ZSTD_INCLUDE_DIR})
15+
1616
else()
17-
#add miniz and pugixml from source
18-
@@ -102,7 +101,10 @@ else()
17+
# add miniz and pugixml from source
18+
@@ -104,7 +103,10 @@ else()
1919
endif()
2020

2121
if(USE_EXTLIBS)
22-
- target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES} ${PUGIXML_LIBRARY} ${ZSTD_LIBRARY})
23-
+ target_link_libraries(${PROJECT_NAME} PRIVATE
24-
+ $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>
25-
+ pugixml::pugixml
26-
+ ZLIB::ZLIB)
22+
- target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES} ${PUGIXML_LIBRARY} ${ZSTD_LIBRARY})
23+
+ target_link_libraries(${PROJECT_NAME} PRIVATE
24+
+ $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>
25+
+ pugixml::pugixml
26+
+ ZLIB::ZLIB)
2727
else()
28-
if(USE_ZSTD)
29-
target_link_libraries(${PROJECT_NAME} ${ZSTD_LIBRARY})
28+
if(USE_ZSTD)
29+
target_link_libraries(${PROJECT_NAME} ${ZSTD_LIBRARY})

ports/tmxlite/portfile.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ vcpkg_from_github(
33
REPO fallahn/tmxlite
44
REF "v${VERSION}"
55
HEAD_REF master
6-
SHA512 0ffe0505329f00ef9872998673a7c220a9a5352f830688ef17952c0c4f001e0c2994a3a28f0e7de60cc82fff2701561cccbc2143fd51984bf4870e7d1fd0a2ba
6+
SHA512 323b8ce20c4d2c7dd98c96ddb4d4d3ba6a3862dbda1e7880086cb493b22e79f1891dda6a4d3145de44b78dfa6258ded366e32f31781f08b1657a1da080013415
77
PATCHES
88
dependencies.patch
99
)

ports/tmxlite/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tmxlite",
3-
"version": "1.4.4",
3+
"version": "1.4.5",
44
"description": "A lightweight C++14 parsing library for tmx map files created with the Tiled map editor.",
55
"homepage": "https://github.com/fallahn/tmxlite",
66
"license": "Zlib",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10037,7 +10037,7 @@
1003710037
"port-version": 0
1003810038
},
1003910039
"tmxlite": {
10040-
"baseline": "1.4.4",
10040+
"baseline": "1.4.5",
1004110041
"port-version": 0
1004210042
},
1004310043
"tobias-loew-flags": {

versions/t-/tmxlite.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": "77055b8151085a3af022c959b30e2222a443fe7a",
5+
"version": "1.4.5",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "b18995c78b7b6057c2a1d69eba2118bfcb17fa36",
510
"version": "1.4.4",

0 commit comments

Comments
 (0)