diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-08-25 14:41:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-25 14:41:41 -0700 |
| commit | 05635bdf788413e0c5f49ea259984b60951890cf (patch) | |
| tree | 9d562fb5601cea44fe50a37bed3ce2f002299710 | |
| parent | 6ed0bc982bf9bdca25439d538f7f272786a7af4d (diff) | |
| download | vcpkg-05635bdf788413e0c5f49ea259984b60951890cf.tar.gz vcpkg-05635bdf788413e0c5f49ea259984b60951890cf.zip | |
Disable fluidlite in CI. (#13125)
* Disable fluidlite in CI.
Fluidlite, added 3 days ago in https://github.com/microsoft/vcpkg/pull/13006 , tries to install the same files as fluidsynth; it's similar to the 'boringssl' situation. Given that fluidlite doens't have any dependencies, this change disables that one rather than fluidsynth,
* Add warning message.
| -rw-r--r-- | ports/fluidlite/portfile.cmake | 4 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/ports/fluidlite/portfile.cmake b/ports/fluidlite/portfile.cmake index 4ae73ae20..929e7f7a8 100644 --- a/ports/fluidlite/portfile.cmake +++ b/ports/fluidlite/portfile.cmake @@ -1,3 +1,7 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/include/fluidsynth/settings.h") + message(FATAL_ERROR "Can't build fluidlite if fluidsynth is installed. Please remove fluidsynth, and try to install fluidlite again if you need it.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO divideconcept/FluidLite diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2360abfbe..ac1b11882 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -422,6 +422,16 @@ flint:x64-osx=fail fltk:arm-uwp=fail fltk:x64-uwp=fail fluidsynth:x64-osx=fail +# fluidlite conflicts with fluidsynth; we test fluidsynth rather than fluidlite because +# fluidlite has no dependencies and thus is less likely to be broken by another package. +fluidlite:arm-uwp=skip +fluidlite:arm64-windows=skip +fluidlite:x64-linux=skip +fluidlite:x64-osx=skip +fluidlite:x64-uwp=skip +fluidlite:x64-windows-static=skip +fluidlite:x64-windows=skip +fluidlite:x86-windows=skip fmem:arm-uwp=fail fmem:x64-uwp=fail fmi4cpp:arm-uwp=fail |