diff options
| author | Barath Kannan <barathsotd@gmail.com> | 2017-11-06 00:31:24 +1100 |
|---|---|---|
| committer | Barath Kannan <barathsotd@gmail.com> | 2017-11-06 00:31:24 +1100 |
| commit | 3a5b383bbec74dbaf0f1056e1a5d315e43d79375 (patch) | |
| tree | 931a448f61b1aea6a6900797d84616b878c6a710 /scripts/cmake | |
| parent | 76837a91b4af5cf5cce8ff1feb847ce4c96b8e05 (diff) | |
| download | vcpkg-3a5b383bbec74dbaf0f1056e1a5d315e43d79375.tar.gz vcpkg-3a5b383bbec74dbaf0f1056e1a5d315e43d79375.zip | |
resolve conflict on non-existant vcpkg_acquire_depot_tools
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_common_functions.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_common_functions.cmake b/scripts/cmake/vcpkg_common_functions.cmake index e48b5e442..40111542d 100644 --- a/scripts/cmake/vcpkg_common_functions.cmake +++ b/scripts/cmake/vcpkg_common_functions.cmake @@ -25,5 +25,4 @@ include(vcpkg_copy_tool_dependencies) include(vcpkg_get_program_files_32_bit) include(vcpkg_get_program_files_platform_bitness) include(vcpkg_get_windows_sdk) -include(vcpkg_acquire_depot_tools) include(vcpkg_replace_string) |
