[simage] use support expression (#29174)

This commit is contained in:
autoantwort 2023-01-25 21:23:05 +01:00 committed by GitHub
parent 15c1388ca3
commit 7bf32c6b93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 10 deletions

View File

@ -1,4 +1,3 @@
set(SIMAGE_VERSION 1.8.2)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
@ -30,13 +29,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
# Depends on the platform
if(VCPKG_TARGET_IS_WINDOWS AND "gdiplus" IN_LIST FEATURES)
message(WARNING "Feature 'gdiplus' will disable feature 'zlib', 'giflib', 'jpeg', 'png' and 'tiff' automaticly.")
elseif ((VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
AND ("gdiplus" IN_LIST FEATURES OR "avienc" IN_LIST FEATURES))
message(FATAL_ERROR "Feature 'avienc' and 'gdiplus' only support Windows.")
endif()
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
-DSIMAGE_BUILD_SHARED_LIBS:BOOL=${SIMAGE_BUILD_SHARED_LIBS}
-DSIMAGE_USE_STATIC_LIBS:BOOL=${SIMAGE_USE_STATIC_LIBS}
@ -61,7 +57,7 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/simage-${SIMAGE_VERSION})
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/simage-${VERSION})
if (NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
vcpkg_copy_tools(TOOL_NAMES simage-config AUTO_CLEAN)

View File

@ -1,7 +1,7 @@
{
"name": "simage",
"version-semver": "1.8.2",
"port-version": 1,
"port-version": 2,
"description": "Image file format library abstraction layer",
"homepage": "https://github.com/coin3d/simage",
"license": "ISC",
@ -96,10 +96,12 @@
]
},
"avienc": {
"description": "Use Video for Windows for AVI encoding"
"description": "Use Video for Windows for AVI encoding",
"supports": "windows"
},
"gdiplus": {
"description": "Use GDI+ on Windows to load/save images"
"description": "Use GDI+ on Windows to load/save images",
"supports": "windows"
},
"giflib": {
"description": "Enable support for GIF images",

View File

@ -7082,7 +7082,7 @@
},
"simage": {
"baseline": "1.8.2",
"port-version": 1
"port-version": 2
},
"simbody": {
"baseline": "2023-01-10",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1e3fa3cf60c5fa543b313ed36d80a09d7a9ec8cd",
"version-semver": "1.8.2",
"port-version": 2
},
{
"git-tree": "d877e927cdad3e67542b5c66c26bdc0bda9f5ade",
"version-semver": "1.8.2",