diff options
| author | Clinton Ingram <clinton.ingram@outlook.com> | 2020-07-30 22:38:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-30 22:38:32 -0700 |
| commit | 3513e92bf9d388ac547d0a87c50a135b4eaa634c (patch) | |
| tree | 2b6d0524588fd9db235624bb515ee5ef45b1c962 /scripts | |
| parent | fe19c5e41167336d8b9d52f3dff44caa72fd6bfa (diff) | |
| download | vcpkg-3513e92bf9d388ac547d0a87c50a135b4eaa634c.tar.gz vcpkg-3513e92bf9d388ac547d0a87c50a135b4eaa634c.zip | |
[mozjpeg] fix build (#12118)
* fix mozjpeg build
* re-disable in CI baseline
* fix static install
* rename static libs, add pkgconfig fixup
* update version string
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ci.baseline.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 05baa8b33..e63835f54 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1083,6 +1083,7 @@ moos-core:x86-windows=fail moos-essential:arm64-windows=fail moos-essential:x64-windows=fail moos-essential:x86-windows=fail +# Conflicts with libjpeg-turbo mozjpeg:arm64-windows = skip mozjpeg:arm-uwp = skip mozjpeg:x64-linux = skip @@ -1943,4 +1944,4 @@ ctp:x64-windows=skip ctp:x64-windows-static=skip ctp:x86-windows=skip protozero:arm-uwp=fail -protozero:x64-uwp=fail
\ No newline at end of file +protozero:x64-uwp=fail |