mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 17:12:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[marble] no absolute paths (#22346)

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ports/marble/portfile.cmake
View File

@ -1,48 +1,46 @@
vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID" ON_ARCH "arm" "x86" ON_LIBRARY_LINKAGE "static")
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/marble REPO KDE/marble
REF 552cb9ae1f34482d1ec56532a703e0d820856286 #v20.04.3 REF 552cb9ae1f34482d1ec56532a703e0d820856286 #v20.04.3
SHA512 ac6106a6db53534c96d7281b1a07624c2852ed8c78cce0b91c5f865b106487f1f49aaa4c72d00ffb1f79a761d8d2eca18129ef9517bef463a1840554ed3e51fb SHA512 ac6106a6db53534c96d7281b1a07624c2852ed8c78cce0b91c5f865b106487f1f49aaa4c72d00ffb1f79a761d8d2eca18129ef9517bef463a1840554ed3e51fb
HEAD_REF master HEAD_REF master
PATCHES "qtfix.patch" PATCHES "qtfix.patch"
) )
vcpkg_configure_cmake( vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA OPTIONS
OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_I18n=ON
-DCMAKE_DISABLE_FIND_PACKAGE_I18n=ON
-DWITH_KF5=OFF -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 # Install plugins and data files
file(GLOB_RECURSE PLUGINS "${CURRENT_PACKAGES_DIR}/plugins/*") file(GLOB_RECURSE PLUGINS "${CURRENT_PACKAGES_DIR}/plugins/*")
file(GLOB_RECURSE PLUGINS_DESIGNER "${CURRENT_PACKAGES_DIR}/lib/plugins/*") file(GLOB_RECURSE PLUGINS_DESIGNER "${CURRENT_PACKAGES_DIR}/lib/plugins/*")
file(GLOB_RECURSE PLUGINS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib/plugins/*") file(GLOB_RECURSE PLUGINS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib/plugins/*")
file(GLOB_RECURSE MKSPECS "${CURRENT_PACKAGES_DIR}/mkspecs/*") file(GLOB_RECURSE MKSPECS "${CURRENT_PACKAGES_DIR}/mkspecs/*")
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT})
file(COPY ${PLUGINS} ${PLUGINS_DESIGNER} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/plugins) file(COPY ${PLUGINS} ${PLUGINS_DESIGNER} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/plugins)
file(COPY ${PLUGINS_DEBUG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/plugins) file(COPY ${PLUGINS_DEBUG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/plugins)
file(COPY "${CURRENT_PACKAGES_DIR}/data" DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) # have to keep folder structure here file(COPY "${CURRENT_PACKAGES_DIR}/data" DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) # have to keep folder structure here
file(COPY ${MKSPECS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/mkspecs) file(COPY ${MKSPECS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/mkspecs)
# remove plugin folder # remove plugin folder
file(REMOVE_RECURSE file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/plugins ${CURRENT_PACKAGES_DIR}/debug/plugins ${CURRENT_PACKAGES_DIR}/plugins ${CURRENT_PACKAGES_DIR}/debug/plugins
${CURRENT_PACKAGES_DIR}/data ${CURRENT_PACKAGES_DIR}/debug/data ${CURRENT_PACKAGES_DIR}/data ${CURRENT_PACKAGES_DIR}/debug/data
${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/mkspecs ${CURRENT_PACKAGES_DIR}/debug/mkspecs ${CURRENT_PACKAGES_DIR}/mkspecs ${CURRENT_PACKAGES_DIR}/debug/mkspecs
${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/debug/share
${CURRENT_PACKAGES_DIR}/debug/lib/plugins ${CURRENT_PACKAGES_DIR}/lib/plugins ${CURRENT_PACKAGES_DIR}/debug/lib/plugins ${CURRENT_PACKAGES_DIR}/lib/plugins
) )
vcpkg_copy_pdbs() 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)

12
ports/marble/vcpkg.json
View File

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

2
versions/baseline.json
View File

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

5
versions/m-/marble.json
View File

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