зеркало из https://github.com/microsoft/vcpkg.git
[libsquish]: Fix config error on android ndk r27 (#40263)
This commit is contained in:
Родитель
71ca2a16e7
Коммит
d087ce1ff3
|
@ -0,0 +1,16 @@
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index a36e574..6f137d5 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -9,9 +9,9 @@
|
||||||
|
# Unix and VS: SSE2 support is enabled by default
|
||||||
|
# use BUILD_SQUISH_WITH_SSE2 and BUILD_SQUISH_WITH_ALTIVEC to override
|
||||||
|
|
||||||
|
-PROJECT(squish)
|
||||||
|
+CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
|
||||||
|
|
||||||
|
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
|
||||||
|
+PROJECT(squish)
|
||||||
|
|
||||||
|
OPTION(BUILD_SQUISH_WITH_OPENMP "Build with OpenMP." ON)
|
||||||
|
|
|
@ -7,6 +7,7 @@ vcpkg_from_sourceforge(
|
||||||
PATCHES
|
PATCHES
|
||||||
fix-export-symbols.patch
|
fix-export-symbols.patch
|
||||||
export-target.patch
|
export-target.patch
|
||||||
|
cmake-version.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "libsquish",
|
"name": "libsquish",
|
||||||
"version": "1.15",
|
"version": "1.15",
|
||||||
"port-version": 13,
|
"port-version": 14,
|
||||||
"description": "Open source DXT compression library.",
|
"description": "Open source DXT compression library.",
|
||||||
"homepage": "https://sourceforge.net/projects/libsquish",
|
"homepage": "https://sourceforge.net/projects/libsquish",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
|
|
@ -5062,7 +5062,7 @@
|
||||||
},
|
},
|
||||||
"libsquish": {
|
"libsquish": {
|
||||||
"baseline": "1.15",
|
"baseline": "1.15",
|
||||||
"port-version": 13
|
"port-version": 14
|
||||||
},
|
},
|
||||||
"libsrt": {
|
"libsrt": {
|
||||||
"baseline": "1.5.3",
|
"baseline": "1.5.3",
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "eb13fe850ce51bd142d19b0662ba0d990efb5d77",
|
||||||
|
"version": "1.15",
|
||||||
|
"port-version": 14
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "b6a8a3e697c1cfcd378bfe725d5994ac9e9dc6d3",
|
"git-tree": "b6a8a3e697c1cfcd378bfe725d5994ac9e9dc6d3",
|
||||||
"version": "1.15",
|
"version": "1.15",
|
||||||
|
|
Загрузка…
Ссылка в новой задаче