aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Hale <Squareys@googlemail.com>2021-09-02 22:24:33 +0200
committerGitHub <noreply@github.com>2021-09-02 13:24:33 -0700
commit8655bfd4b311df8dd853ca49969a9ecfac94ea91 (patch)
tree094312d9e50a82e7c7bce576aa13779936239995
parenta35b42633c56923608a4f7222d4aa7b996015bf2 (diff)
downloadvcpkg-8655bfd4b311df8dd853ca49969a9ecfac94ea91.tar.gz
vcpkg-8655bfd4b311df8dd853ca49969a9ecfac94ea91.zip
[corrade/magnum/-plugins] Fix build, minor cleanup and minor warning fix in vcpkg CMake scripts (#19435)
* [magnum/-plugins] Remove obsolete patches that no longer apply Signed-off-by: Squareys <squareys@googlemail.com> * [corrade] Make feature to flag translation consistent to fix warning Consistent with magnum & magnum-plugins Signed-off-by: Squareys <squareys@googlemail.com> * Fix warning message for dlls without matching pdbs always displayed Signed-off-by: Squareys <squareys@googlemail.com> * Fix the baseline version * Revert the changes in vcpkg_copy_pdbs.cmake Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Diffstat
-rw-r--r--ports/corrade/portfile.cmake16
-rw-r--r--ports/corrade/vcpkg.json2
-rw-r--r--ports/magnum-plugins/001-tools-path.patch26
-rw-r--r--ports/magnum-plugins/CONTROL2
-rw-r--r--ports/magnum-plugins/portfile.cmake1
-rw-r--r--ports/magnum/001-tools-path.patch26
-rw-r--r--ports/magnum/CONTROL2
-rw-r--r--ports/magnum/portfile.cmake1
-rw-r--r--versions/baseline.json6
-rw-r--r--versions/c-/corrade.json5
-rw-r--r--versions/m-/magnum-plugins.json5
-rw-r--r--versions/m-/magnum.json5
12 files changed, 28 insertions, 69 deletions
diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake
index 06615bf11..187374a6d 100644
--- a/ports/corrade/portfile.cmake
+++ b/ports/corrade/portfile.cmake
@@ -10,28 +10,27 @@ vcpkg_from_github(
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
# Handle features
-set(_COMPONENT_FLAGS "")
+set(_COMPONENTS "")
foreach(_feature IN LISTS ALL_FEATURES)
# Uppercase the feature name and replace "-" with "_"
string(TOUPPER "${_feature}" _FEATURE)
string(REPLACE "-" "_" _FEATURE "${_FEATURE}")
- # Turn "-DWITH_*=" ON or OFF depending on whether the feature
- # is in the list.
- if(_feature IN_LIST FEATURES)
- list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=ON")
- else()
- list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=OFF")
+ # Final feature is empty, ignore it
+ if(_feature)
+ list(APPEND _COMPONENTS ${_feature} WITH_${_FEATURE})
endif()
endforeach()
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS})
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA # Disable this option if project cannot be built with Ninja
OPTIONS
+ ${FEATURE_OPTIONS}
-DUTILITY_USE_ANSI_COLORS=ON
-DBUILD_STATIC=${BUILD_STATIC}
- ${_COMPONENT_FLAGS}
)
vcpkg_install_cmake()
@@ -68,5 +67,4 @@ file(INSTALL ${SOURCE_PATH}/COPYING
DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
RENAME copyright)
-
vcpkg_copy_pdbs()
diff --git a/ports/corrade/vcpkg.json b/ports/corrade/vcpkg.json
index 3f738261d..83940abbc 100644
--- a/ports/corrade/vcpkg.json
+++ b/ports/corrade/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "corrade",
"version-string": "2020.06",
- "port-version": 1,
+ "port-version": 2,
"description": "C++11/C++14 multiplatform utility library.",
"homepage": "https://magnum.graphics/corrade/",
"default-features": [
diff --git a/ports/magnum-plugins/001-tools-path.patch b/ports/magnum-plugins/001-tools-path.patch
deleted file mode 100644
index 18a351c2e..000000000
--- a/ports/magnum-plugins/001-tools-path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake
-index e63bc03..052006f 100644
---- a/modules/FindCorrade.cmake
-+++ b/modules/FindCorrade.cmake
-@@ -397,7 +397,7 @@ foreach(_component ${Corrade_FIND_COMPONENTS})
- if(_component MATCHES ${_CORRADE_EXECUTABLE_COMPONENTS})
- add_executable(Corrade::${_component} IMPORTED)
-
-- find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component})
-+ find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component} PATH_SUFFIXES corrade)
- mark_as_advanced(CORRADE_${_COMPONENT}_EXECUTABLE)
-
- if(CORRADE_${_COMPONENT}_EXECUTABLE)
-diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake
-index 8df555d..12f7aa4 100644
---- a/modules/FindMagnum.cmake
-+++ b/modules/FindMagnum.cmake
-@@ -493,7 +493,7 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
- if(_component MATCHES ${_MAGNUM_EXECUTABLE_COMPONENTS})
- add_executable(Magnum::${_component} IMPORTED)
-
-- find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component})
-+ find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component} PATH_SUFFIXES magnum)
- mark_as_advanced(MAGNUM_${_COMPONENT}_EXECUTABLE)
-
- if(MAGNUM_${_COMPONENT}_EXECUTABLE)
diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL
index bbec383e9..09eaab782 100644
--- a/ports/magnum-plugins/CONTROL
+++ b/ports/magnum-plugins/CONTROL
@@ -1,6 +1,6 @@
Source: magnum-plugins
Version: 2020.06
-Port-Version: 5
+Port-Version: 6
Build-Depends: magnum[core]
Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization
Homepage: https://magnum.graphics/
diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake
index f1c27750e..b3ed961df 100644
--- a/ports/magnum-plugins/portfile.cmake
+++ b/ports/magnum-plugins/portfile.cmake
@@ -5,7 +5,6 @@ vcpkg_from_github(
SHA512 3c11c2928bfc9d04c1ad64f72b6ffac6cf80a1ef3aacc5d0486b9ad955cf4f6ea6d5dcb3846dc5d73f64ec522a015eafb997f62c79ad7ff91169702341f23af0
HEAD_REF master
PATCHES
- 001-tools-path.patch
002-fix-stb-conflict.patch
)
diff --git a/ports/magnum/001-tools-path.patch b/ports/magnum/001-tools-path.patch
deleted file mode 100644
index 18a351c2e..000000000
--- a/ports/magnum/001-tools-path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake
-index e63bc03..052006f 100644
---- a/modules/FindCorrade.cmake
-+++ b/modules/FindCorrade.cmake
-@@ -397,7 +397,7 @@ foreach(_component ${Corrade_FIND_COMPONENTS})
- if(_component MATCHES ${_CORRADE_EXECUTABLE_COMPONENTS})
- add_executable(Corrade::${_component} IMPORTED)
-
-- find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component})
-+ find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component} PATH_SUFFIXES corrade)
- mark_as_advanced(CORRADE_${_COMPONENT}_EXECUTABLE)
-
- if(CORRADE_${_COMPONENT}_EXECUTABLE)
-diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake
-index 8df555d..12f7aa4 100644
---- a/modules/FindMagnum.cmake
-+++ b/modules/FindMagnum.cmake
-@@ -493,7 +493,7 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
- if(_component MATCHES ${_MAGNUM_EXECUTABLE_COMPONENTS})
- add_executable(Magnum::${_component} IMPORTED)
-
-- find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component})
-+ find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component} PATH_SUFFIXES magnum)
- mark_as_advanced(MAGNUM_${_COMPONENT}_EXECUTABLE)
-
- if(MAGNUM_${_COMPONENT}_EXECUTABLE)
diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL
index b595fa45c..1383eb1f8 100644
--- a/ports/magnum/CONTROL
+++ b/ports/magnum/CONTROL
@@ -1,6 +1,6 @@
Source: magnum
Version: 2020.06
-Port-Version: 5
+Port-Version: 6
Build-Depends: corrade[utility]
Description: C++11/C++14 graphics middleware for games and data visualization
Homepage: https://magnum.graphics/
diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake
index e4144595e..d060c4b9a 100644
--- a/ports/magnum/portfile.cmake
+++ b/ports/magnum/portfile.cmake
@@ -5,7 +5,6 @@ vcpkg_from_github(
SHA512 65b0c8a4520d1d282420c30ecd7c8525525d4dbb6e562e1e2e93d110f4eb686af43f098bf02460727fab1e1f9446dd00a99051e150c05ea40b1486a44fea1042
HEAD_REF master
PATCHES
- 001-tools-path.patch
002-sdl-includes.patch
)
diff --git a/versions/baseline.json b/versions/baseline.json
index 9bd4e2e4c..44f2f5921 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1406,7 +1406,7 @@
},
"corrade": {
"baseline": "2020.06",
- "port-version": 1
+ "port-version": 2
},
"cpp-base64": {
"baseline": "V2.rc.08",
@@ -3966,7 +3966,7 @@
},
"magnum": {
"baseline": "2020.06",
- "port-version": 5
+ "port-version": 6
},
"magnum-extras": {
"baseline": "2020.06",
@@ -3978,7 +3978,7 @@
},
"magnum-plugins": {
"baseline": "2020.06",
- "port-version": 5
+ "port-version": 6
},
"mailio": {
"baseline": "0.20.0",
diff --git a/versions/c-/corrade.json b/versions/c-/corrade.json
index e0f2e29f7..08452c733 100644
--- a/versions/c-/corrade.json
+++ b/versions/c-/corrade.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "ec9f53411152ed98e9d591afed7e34e65fb7abeb",
+ "version-string": "2020.06",
+ "port-version": 2
+ },
+ {
"git-tree": "12cd1f62edbe4e05de794c862facfdfd0fe8171d",
"version-string": "2020.06",
"port-version": 1
diff --git a/versions/m-/magnum-plugins.json b/versions/m-/magnum-plugins.json
index 84b2d06f1..c506406ff 100644
--- a/versions/m-/magnum-plugins.json
+++ b/versions/m-/magnum-plugins.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "3aedbba0e9e694651549ff34fba8d6eeeb3fdde6",
+ "version-string": "2020.06",
+ "port-version": 6
+ },
+ {
"git-tree": "457d2fb07dd06abe61d8bdee77bc5dc1ff9391a5",
"version-string": "2020.06",
"port-version": 5
diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json
index 6103787d6..006dae3e1 100644
--- a/versions/m-/magnum.json
+++ b/versions/m-/magnum.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "f420e42c1b841b4f3b2f2cda488a35f68b0677d7",
+ "version-string": "2020.06",
+ "port-version": 6
+ },
+ {
"git-tree": "cb97c301133d04f205cb1547e5559341474f842e",
"version-string": "2020.06",
"port-version": 5
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-28 15:39:46 +0000