aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Traversaro <silvio.traversaro@iit.it>2019-09-16 21:58:05 +0200
committerPhil Christensen <philc@microsoft.com>2019-09-16 12:58:05 -0700
commit0053942ee563c0ba730f0fae4899caf4060619fc (patch)
tree960ec2f3aac1ac28fb53f215c6e5de1e1717ac6e
parent9b4b5f4ce79df624b4fcf3ae969c6ba61d04d1fb (diff)
downloadvcpkg-0053942ee563c0ba730f0fae4899caf4060619fc.tar.gz
vcpkg-0053942ee563c0ba730f0fae4899caf4060619fc.zip
[libyaml] Fix CMake package and CMake targets (#8177)
-rw-r--r--ports/libyaml/CONTROL2
-rw-r--r--ports/libyaml/portfile.cmake6
2 files changed, 5 insertions, 3 deletions
diff --git a/ports/libyaml/CONTROL b/ports/libyaml/CONTROL
index e38c0f9d0..6dbff7ff3 100644
--- a/ports/libyaml/CONTROL
+++ b/ports/libyaml/CONTROL
@@ -1,3 +1,3 @@
Source: libyaml
-Version: 0.2.2-1
+Version: 0.2.2-2
Description: A C library for parsing and emitting YAML.
diff --git a/ports/libyaml/portfile.cmake b/ports/libyaml/portfile.cmake
index 6c6a6b97b..3d7f12d7e 100644
--- a/ports/libyaml/portfile.cmake
+++ b/ports/libyaml/portfile.cmake
@@ -15,12 +15,14 @@ vcpkg_configure_cmake(
PREFER_NINJA
OPTIONS
-DBUILD_TESTING=OFF
+ -DINSTALL_CMAKE_DIR=share/yaml
)
vcpkg_install_cmake()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/config.h)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/yaml TARGET_PATH share/yaml)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/config.h ${CURRENT_PACKAGES_DIR}/debug/share)
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/libyaml/copyright COPYONLY)