diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-20 13:50:12 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-20 13:50:12 -0800 |
| commit | ea831f43024a06700a9d8e901c1cb87844a63d81 (patch) | |
| tree | fd1a423c0f13fda818445d069a73453746d1d9f9 /scripts/cmake | |
| parent | 96b282341fd80763ef8533ba6619064ad3e8a60f (diff) | |
| parent | edec46528d897c584ab1d9454b36a58f7fece217 (diff) | |
| download | vcpkg-ea831f43024a06700a9d8e901c1cb87844a63d81.tar.gz vcpkg-ea831f43024a06700a9d8e901c1cb87844a63d81.zip | |
Merge branch 'master' into dev/philc/4966
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index ebe46b335..b6cfc4aab 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -153,6 +153,9 @@ function(vcpkg_find_acquire_program VAR) set(URL "https://sourceforge.net/projects/winflexbison/files/winflexbison-2.5.16.zip/download") set(ARCHIVE "win_flex_bison-2.5.16.zip") set(HASH 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123) + if(NOT EXISTS "${PATHS}/data/m4sugar/m4sugar.m4" AND SUBDIR STREQUAL "win_flex-2.5.16") + file(REMOVE_RECURSE "${PATHS}") + endif() else() set(PROGNAME flex) set(APT_PACKAGE_NAME flex) |