[marble] no absolute paths (#22346)

This commit is contained in:
autoantwort 2022-01-06 05:19:52 +01:00 committed by GitHub
parent b87c730e96
commit 6127446f25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 24 deletions

View File

@ -1,4 +1,3 @@
vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID" ON_ARCH "arm" "x86" ON_LIBRARY_LINKAGE "static")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
@ -9,17 +8,16 @@ vcpkg_from_github(
PATCHES "qtfix.patch"
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DCMAKE_DISABLE_FIND_PACKAGE_I18n=ON
-DWITH_KF5=OFF
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
# Install plugins and data files
file(GLOB_RECURSE PLUGINS "${CURRENT_PACKAGES_DIR}/plugins/*")
@ -45,4 +43,4 @@ file(REMOVE_RECURSE
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,7 +1,7 @@
{
"name": "marble",
"version-string": "19.08.2",
"port-version": 2,
"port-version": 3,
"description": "Marble KDE library",
"homepage": "https://marble.kde.org",
"supports": "windows & x64 & !static",
@ -9,6 +9,14 @@
"qt5-base",
"qt5-quickcontrols",
"qt5-svg",
"qt5-webchannel"
"qt5-webchannel",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -4294,7 +4294,7 @@
},
"marble": {
"baseline": "19.08.2",
"port-version": 2
"port-version": 3
},
"marl": {
"baseline": "2021-04-25",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "eb15f05858eaff46b5d7b142d3c874f889d26557",
"version-string": "19.08.2",
"port-version": 3
},
{
"git-tree": "882d37f618c122d3484dcb02cb4f35ead8580768",
"version-string": "19.08.2",