diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-03-22 16:47:03 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-03-22 16:47:03 -0700 |
| commit | c7664d1538c8ca50aafce6d90b20feb689506659 (patch) | |
| tree | b222663025c558a99d935e79ade773d63958fea5 /ports/yaml-cpp | |
| parent | bc4fd2653bba4b22b2a9b94a5f22ee0e253413b5 (diff) | |
| parent | 637c9bc0f012e402f5cff5e5f9ac1ca993f89ab8 (diff) | |
| download | vcpkg-c7664d1538c8ca50aafce6d90b20feb689506659.tar.gz vcpkg-c7664d1538c8ca50aafce6d90b20feb689506659.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'ports/yaml-cpp')
| -rw-r--r-- | ports/yaml-cpp/portfile.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ports/yaml-cpp/portfile.cmake b/ports/yaml-cpp/portfile.cmake index 096b178ac..071931f64 100644 --- a/ports/yaml-cpp/portfile.cmake +++ b/ports/yaml-cpp/portfile.cmake @@ -17,7 +17,12 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) +if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) + vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) +endif() +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/yaml-cpp) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/yaml-cpp) +endif() # Adjust paths and remove hardcoded ones from the config files file(READ ${CURRENT_PACKAGES_DIR}/share/yaml-cpp/yaml-cpp-config.cmake YAML_CONFIG) |