diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-12-18 11:43:25 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-12-18 11:43:25 -0800 |
| commit | 7a67785e14130170679d19be832f2e1ba2530560 (patch) | |
| tree | 49196cc5252f2e800a18802548006977da276447 /scripts/cmake | |
| parent | 524a1414fc395fdc60951d63f4a66683309fd630 (diff) | |
| parent | b2996e1fd48842446a64443d057c576f819bda00 (diff) | |
| download | vcpkg-7a67785e14130170679d19be832f2e1ba2530560.tar.gz vcpkg-7a67785e14130170679d19be832f2e1ba2530560.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/roschuma/4988
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) |