diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2021-01-19 12:05:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 12:05:08 -0800 |
| commit | ab077c4e55e1c17e6603b539f6497a2bf76f25e6 (patch) | |
| tree | 0321bdc72b3b380306f12ad48eaab750c215a373 | |
| parent | 2ac5b0564c9bd703cdc8d1acb31b721326e54227 (diff) | |
| download | vcpkg-ab077c4e55e1c17e6603b539f6497a2bf76f25e6.tar.gz vcpkg-ab077c4e55e1c17e6603b539f6497a2bf76f25e6.zip | |
[simage] Fix optional dependencies (#15683)
* [simage] Fix optional dependencies
* [simage] Add to versions db
| -rw-r--r-- | port_versions/baseline.json | 2 | ||||
| -rw-r--r-- | port_versions/s-/simage.json | 5 | ||||
| -rw-r--r-- | ports/simage/CONTROL | 3 | ||||
| -rw-r--r-- | ports/simage/portfile.cmake | 18 |
4 files changed, 25 insertions, 3 deletions
diff --git a/port_versions/baseline.json b/port_versions/baseline.json index fe6e0f26f..66d71ff5f 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -5286,7 +5286,7 @@ }, "simage": { "baseline": "1.8.0", - "port-version": 0 + "port-version": 1 }, "simde": { "baseline": "0.7.0", diff --git a/port_versions/s-/simage.json b/port_versions/s-/simage.json index 9f0b909c9..e245aca0b 100644 --- a/port_versions/s-/simage.json +++ b/port_versions/s-/simage.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "7efea762708b2fa21ac7919656bfcdfccbd84339", + "version-string": "1.8.0", + "port-version": 1 + }, + { "git-tree": "d73e98a3ac5a4ed61f96dce0e08628170ea803ad", "version-string": "1.8.0", "port-version": 0 diff --git a/ports/simage/CONTROL b/ports/simage/CONTROL index f88751b8d..e25840834 100644 --- a/ports/simage/CONTROL +++ b/ports/simage/CONTROL @@ -1,5 +1,6 @@ Source: simage Version: 1.8.0 +Port-Version: 1 Description: Image file format library abstraction layer -Build-Depends: giflib (linux|uwp), libjpeg-turbo (linux|uwp), libpng (linux|uwp), libsndfile (linux|uwp), tiff (linux|uwp), libvorbis (linux|uwp) +Build-Depends: giflib (!windows&!osx), libjpeg-turbo (!windows&!osx), libpng (!windows&!osx), libsndfile, tiff (!windows&!osx), libvorbis, zlib (!windows&!osx) Homepage: https://github.com/coin3d/simage diff --git a/ports/simage/portfile.cmake b/ports/simage/portfile.cmake index 59fbf4557..6b890c8a5 100644 --- a/ports/simage/portfile.cmake +++ b/ports/simage/portfile.cmake @@ -20,7 +20,15 @@ else() set(SIMAGE_BUILD_SHARED_LIBS ON) endif() -if(VCPKG_TARGET_IS_UWP) +set(OSX_OR_WINDOWS OFF) +if((VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) OR VCPKG_TARGET_IS_OSX) + set(OSX_OR_WINDOWS ON) +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) + set(SIMAGE_USE_AVIENC ON) + set(SIMAGE_USE_GDIPLUS ON) +else() set(SIMAGE_USE_AVIENC OFF) set(SIMAGE_USE_GDIPLUS OFF) endif() @@ -32,6 +40,14 @@ vcpkg_configure_cmake( -DSIMAGE_BUILD_SHARED_LIBS=${SIMAGE_BUILD_SHARED_LIBS} -DSIMAGE_USE_AVIENC=${SIMAGE_USE_AVIENC} -DSIMAGE_USE_GDIPLUS=${SIMAGE_USE_GDIPLUS} + -DCMAKE_DISABLE_FIND_PACKAGE_FLAC=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${OSX_OR_WINDOWS} + -DCMAKE_DISABLE_FIND_PACKAGE_GIF=${OSX_OR_WINDOWS} + -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${OSX_OR_WINDOWS} + -DCMAKE_DISABLE_FIND_PACKAGE_PNG=${OSX_OR_WINDOWS} + -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=${OSX_OR_WINDOWS} ) vcpkg_install_cmake() |