diff options
| author | Andrei Lebedev <lebdron@gmail.com> | 2020-08-05 23:01:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 14:01:13 -0700 |
| commit | 11f15f3ab8eddff06066b662e36ec23c8e434859 (patch) | |
| tree | 260ba599742774f6d4bd4218e2486030e88633a6 | |
| parent | e79a4f3630073a1f87fd654f1d0df9a38689c92b (diff) | |
| download | vcpkg-11f15f3ab8eddff06066b662e36ec23c8e434859.tar.gz vcpkg-11f15f3ab8eddff06066b662e36ec23c8e434859.zip | |
[libpq] only require bison and flex on Windows (#12674)
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
| -rw-r--r-- | ports/libpq/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libpq/portfile.cmake | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL index cd63f7671..e42dd5f5e 100644 --- a/ports/libpq/CONTROL +++ b/ports/libpq/CONTROL @@ -1,6 +1,6 @@ Source: libpq Version: 12.2 -Port-Version: 5 +Port-Version: 6 Build-Depends: libpq[bonjour] (osx) Supports: !uwp Homepage: https://www.postgresql.org/ diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 756e20d1b..3d147104e 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -67,7 +67,11 @@ vcpkg_extract_source_archive_ex( ) unset(buildenv_contents) # Get paths to required programs -foreach(program_name BISON FLEX PERL) +set(REQUIRED_PROGRAMS PERL) +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND REQUIRED_PROGRAMS BISON FLEX) +endif() +foreach(program_name ${REQUIRED_PROGRAMS}) # Need to rename win_bison and win_flex to just bison and flex vcpkg_find_acquire_program(${program_name}) get_filename_component(${program_name}_EXE_PATH ${${program_name}} DIRECTORY) |