Skip to content

[simage] Fix optional dependencies #15683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 3 commits into from
Jan 19, 2021
Merged

[simage] Fix optional dependencies #15683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9ad77d
[simage] Fix optional dependencies
ras0219-msft Jan 16, 2021
8bd470d
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
ras0219-msft Jan 16, 2021
f938708
[simage] Add to versions db
ras0219-msft Jan 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion port_versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5274,7 +5274,7 @@
},
"simage": {
"baseline": "1.8.0",
"port-version": 0
"port-version": 1
},
"simde": {
"baseline": "0.7.0",
Expand Down
5 changes: 5 additions & 0 deletions port_versions/s-/simage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7efea762708b2fa21ac7919656bfcdfccbd84339",
"version-string": "1.8.0",
"port-version": 1
},
{
"git-tree": "d73e98a3ac5a4ed61f96dce0e08628170ea803ad",
"version-string": "1.8.0",
Expand Down
3 changes: 2 additions & 1 deletion ports/simage/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Copy link
Contributor

@dg0yt dg0yt Jun 19, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

!windows also excludes uwp. This is different than before, and it doesn't align with the OSX_OR_WINDOWS variable in portfile.cmake. What is the desired state for UWP?
Now this caused the tiff update to 4.3.0 to pass through CI without testing simage, but hits CI for ports which happen to install tiff before simage for UWP: #17519, #18393, #18546

Homepage: https://github.com/coin3d/simage
18 changes: 17 additions & 1 deletion ports/simage/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand Down