This repository was archived by the owner on Jun 12, 2025. It is now read-only.
Tags: loot/yaml-cpp
Tags
Merge branch 'master' into merge-key-support
Run GitHub Actions workflow on merge-key-support branch
Add support for merge keys Merge keys are specified here[1] for YAML 1.1. While not part of the YAML 1.2 specification, they're very useful and are supported in other implementations[2][3][4][5][6][7][8][9][10] that target 1.2. Support for merge keys is optional and disabled by default. It can be enabled by defining YAML_CPP_SUPPORT_MERGE_KEYS, either directly or by setting the CMake option YAML_CPP_SUPPORT_MERGE_KEYS=ON. [1]: http://yaml.org/type/merge.html [2]: https://github.com/go-yaml/yaml [3]: https://github.com/ruby/psych [4]: https://pypi.org/project/ruamel.yaml/ [5]: https://github.com/pantoniou/libfyaml [6]: https://github.com/aaubry/YamlDotNet [7]: https://github.com/goccy/go-yaml [8]: https://github.com/nodeca/js-yaml [9]: https://github.com/eemeli/yaml [10]: https://symfony.com/doc/current/components/yaml.html
Add support for merge keys Merge keys are specified here[1] for YAML 1.1. While not part of the YAML 1.2 specification, they're very useful and are supported in other implementations[2][3][4] that target 1.2. Support for merge keys is optional and disabled by default. It can be enabled by defining YAML_CPP_SUPPORT_MERGE_KEYS, either directly or by setting the CMake option YAML_CPP_SUPPORT_MERGE_KEYS=ON. [1]: http://yaml.org/type/merge.html [2]: https://github.com/go-yaml/yaml [3]: https://github.com/ruby/psych [4]: https://bitbucket.org/ruamel/yaml
Add support for merge keys Merge keys are specified here[1] for YAML 1.1. While not part of the YAML 1.2 specification, they're very useful and are supported in other implementations[2][3][4] that target 1.2. Support for merge keys is optional and disabled by default. It can be enabled by defining YAML_CPP_SUPPORT_MERGE_KEYS, either directly or by setting the CMake option YAML_CPP_SUPPORT_MERGE_KEYS=ON. [1]: http://yaml.org/type/merge.html [2]: https://github.com/go-yaml/yaml [3]: https://github.com/ruby/psych [4]: https://bitbucket.org/ruamel/yaml
Bump CMake version to 0.6.2. It was incorrectly left at 0.6.0 when 0.6.1 was released, so this needs to be done to make it consistent between the tagged version and the CMake version.
Fix paths in pkg-config file (jbeder#556) pkg-config should be giving absolute paths rather than relative paths.
PreviousNext