diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-04-12 02:30:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 02:30:59 -0700 |
| commit | 0e000644053015b7f7a0985e14f0bd384c847d17 (patch) | |
| tree | 7e456fd12b3bf281b28587338f1650017c8b32ab /ports/devil | |
| parent | 93ce6b4f27602cd18f4327c2cfd84093d472b8bb (diff) | |
| parent | 39ba5b2b30c9f7b49e777a62093cdd49d05b53a9 (diff) | |
| download | vcpkg-0e000644053015b7f7a0985e14f0bd384c847d17.tar.gz vcpkg-0e000644053015b7f7a0985e14f0bd384c847d17.zip | |
Merge branch 'master' into master
Diffstat (limited to 'ports/devil')
| -rw-r--r-- | ports/devil/CONTROL | 2 | ||||
| -rw-r--r-- | ports/devil/portfile.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ports/devil/CONTROL b/ports/devil/CONTROL index 18d263348..98c27363a 100644 --- a/ports/devil/CONTROL +++ b/ports/devil/CONTROL @@ -1,5 +1,5 @@ Source: devil -Version: 1.8.0-3 +Version: 1.8.0-4 Build-Depends: Description: A full featured cross-platform image library Default-Features: libpng, tiff, libjpeg, openexr, jasper, lcms diff --git a/ports/devil/portfile.cmake b/ports/devil/portfile.cmake index 7ab5a6c06..db9944895 100644 --- a/ports/devil/portfile.cmake +++ b/ports/devil/portfile.cmake @@ -61,6 +61,7 @@ set(IL_USE_DXTC_SQUISH 0) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/DevIL PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS -DIL_NO_PNG=${IL_NO_PNG} -DIL_NO_TIF=${IL_NO_TIF} |