diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-18 15:33:10 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-18 15:33:10 -0800 |
| commit | 47c60f9b6b6f58c9210bc1ca6cd7fa431618b0d2 (patch) | |
| tree | ff1b03fd083d6330f1e696a79213363f677c3a51 /scripts/cmake | |
| parent | 165f96bb51a33239f81cd084378fde0479283508 (diff) | |
| parent | d2b0798854c16d8644e3ba2f69ffd3baa448f4ec (diff) | |
| download | vcpkg-47c60f9b6b6f58c9210bc1ca6cd7fa431618b0d2.tar.gz vcpkg-47c60f9b6b6f58c9210bc1ca6cd7fa431618b0d2.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4952
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) |