[fkyaml] fix natvis install issue for downstream ports (#50265)

This commit is contained in:
Sean Farrell 2026-03-03 18:15:02 +01:00 committed by GitHub
parent fba77f882b
commit c1f21baeaf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 38 additions and 15 deletions

View File

@ -0,0 +1,30 @@
CMakeLists.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c2b923..7e7d447 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,11 +79,12 @@ target_include_directories(
if(MSVC)
set(FK_YAML_INSTALL_NATVIS ON)
set(FK_YAML_NATVIS_FILE ${FK_YAML_TARGET_NAME}.natvis)
+ set(FK_YAML_NATVIS_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}")
target_sources(
${FK_YAML_TARGET_NAME}
INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${FK_YAML_NATVIS_FILE}>
- $<INSTALL_INTERFACE:${FK_YAML_NATVIS_FILE}>
+ $<INSTALL_INTERFACE:${FK_YAML_NATVIS_INSTALL_DIR}/${FK_YAML_NATVIS_FILE}>
)
endif()
@@ -171,7 +172,7 @@ if(FK_YAML_INSTALL)
if(FK_YAML_INSTALL_NATVIS)
install(
FILES ${FK_YAML_NATVIS_FILE}
- DESTINATION .
+ DESTINATION "${FK_YAML_NATVIS_INSTALL_DIR}"
)
endif()

View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1a8b81..59c9464 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,7 +190,7 @@ if(FK_YAML_INSTALL)
if(FK_YAML_INSTALL_NATVIS)
install(
FILES ${FK_YAML_NATVIS_FILE}
- DESTINATION .
+ DESTINATION share/fkyaml
)
endif()

View File

@ -5,7 +5,7 @@ vcpkg_from_github(
SHA512 20a7e2a236f77e27a676348585cbf6c36d8c46f1ad0964b879eb61925e3d6545d6dda46379b897712890faa2b8d5e837b7f9cc312448a3d762f0017c618cbcd1
HEAD_REF develop
PATCHES
fix-natvis-path.patch
fix-natvis-install.patch
)
set(VCPKG_BUILD_TYPE release) # header-only port

View File

@ -1,6 +1,7 @@
{
"name": "fkyaml",
"version": "0.4.2",
"port-version": 1,
"description": "A C++ header-only YAML library",
"homepage": "https://github.com/fktn-k/fkYAML",
"license": "MIT",

View File

@ -3026,7 +3026,7 @@
},
"fkyaml": {
"baseline": "0.4.2",
"port-version": 0
"port-version": 1
},
"flagpp": {
"baseline": "3.1.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "19fa1243ae8b6aaabf8a727b91ede01b6428545b",
"version": "0.4.2",
"port-version": 1
},
{
"git-tree": "21138b93a764b6ba43549ceb71ff28b5aecd9ea6",
"version": "0.4.2",