mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-18 16:53:02 +08:00
[marble] update to 22.04.0 (#24691)
* [marble] update to 22.04.0 * update version * Add license * update version * add option * update version
This commit is contained in:
JonLiu1993
GitHub
parent
0e6728a8bf
commit
66444e6324
@ -2,10 +2,11 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO KDE/marble
|
||||
REF 552cb9ae1f34482d1ec56532a703e0d820856286 #v20.04.3
|
||||
SHA512 ac6106a6db53534c96d7281b1a07624c2852ed8c78cce0b91c5f865b106487f1f49aaa4c72d00ffb1f79a761d8d2eca18129ef9517bef463a1840554ed3e51fb
|
||||
REF 7def3b68fd5de9b7f0734410a9f955bd1082097b #v22.04.0
|
||||
SHA512 2977a051a7f91603dea5960ddf0fed2fd5a991d554bce899ce4d8a0d3648546ff2c4c75bebcd3704d07d875b656ab7dc64c567b1bc9f6975745be327375faa90
|
||||
HEAD_REF master
|
||||
PATCHES "qtfix.patch"
|
||||
PATCHES
|
||||
qtfix.patch
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
@ -25,22 +26,34 @@ file(GLOB_RECURSE PLUGINS_DESIGNER "${CURRENT_PACKAGES_DIR}/lib/plugins/*")
|
||||
file(GLOB_RECURSE PLUGINS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib/plugins/*")
|
||||
file(GLOB_RECURSE MKSPECS "${CURRENT_PACKAGES_DIR}/mkspecs/*")
|
||||
|
||||
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT})
|
||||
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 "${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(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
|
||||
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 "${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")
|
||||
|
||||
# remove plugin folder
|
||||
file(REMOVE_RECURSE
|
||||
${CURRENT_PACKAGES_DIR}/plugins ${CURRENT_PACKAGES_DIR}/debug/plugins
|
||||
${CURRENT_PACKAGES_DIR}/data ${CURRENT_PACKAGES_DIR}/debug/data
|
||||
${CURRENT_PACKAGES_DIR}/debug/include
|
||||
${CURRENT_PACKAGES_DIR}/mkspecs ${CURRENT_PACKAGES_DIR}/debug/mkspecs
|
||||
${CURRENT_PACKAGES_DIR}/debug/share
|
||||
${CURRENT_PACKAGES_DIR}/debug/lib/plugins ${CURRENT_PACKAGES_DIR}/lib/plugins
|
||||
"${CURRENT_PACKAGES_DIR}/plugins" "${CURRENT_PACKAGES_DIR}/debug/plugins"
|
||||
"${CURRENT_PACKAGES_DIR}/data" "${CURRENT_PACKAGES_DIR}/debug/data"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/include"
|
||||
"${CURRENT_PACKAGES_DIR}/mkspecs" "${CURRENT_PACKAGES_DIR}/debug/mkspecs"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/share"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}/lib/plugins"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/marble-qt.exe"
|
||||
)
|
||||
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/astro.dll" "${CURRENT_PACKAGES_DIR}/bin/astro.dll")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/marbledeclarative.dll" "${CURRENT_PACKAGES_DIR}/bin/marbledeclarative.dll")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/marblewidget-qt5.dll" "${CURRENT_PACKAGES_DIR}/bin/marblewidget-qt5.dll")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/marble-qt.exe" "${CURRENT_PACKAGES_DIR}/tools/marble/marble-qt.exe")
|
||||
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/astrod.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/astrod.dll")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/marbledeclaratived.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/marbledeclaratived.dll")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/marblewidget-qt5d.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/marblewidget-qt5d.dll")
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a3b2139dc..1f9a10513 100644
|
||||
index 65b58c4..a8f024c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -171,7 +171,7 @@ set (PEDANTIC FALSE CACHE BOOL "Determines if we should compile with -Wall -Werr
|
||||
@@ -184,7 +184,7 @@ set (PEDANTIC FALSE CACHE BOOL "Determines if we should compile with -Wall -Werr
|
||||
set (WITH_DESIGNER_PLUGIN TRUE CACHE BOOL "Build plugins for Qt Designer")
|
||||
add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget support in Qt Designer. Toggle with WITH_DESIGNER_PLUGIN=YES/NO")
|
||||
|
||||
@ -11,73 +11,12 @@ index a3b2139dc..1f9a10513 100644
|
||||
if (NOT QT_PLUGINS_DIR)
|
||||
set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins)
|
||||
endif()
|
||||
@@ -248,7 +248,7 @@ add_definitions(
|
||||
-DQT_NO_URL_CAST_FROM_STRING
|
||||
-DQT_NO_CAST_TO_ASCII
|
||||
-DQT_NO_CAST_FROM_BYTEARRAY
|
||||
- -DQT_STRICT_ITERATORS
|
||||
+# -DQT_STRICT_ITERATORS
|
||||
-DQT_DISABLE_DEPRECATED_BEFORE=0x050700
|
||||
)
|
||||
|
||||
diff --git a/src/apps/marble-qt/CMakeLists.txt b/src/apps/marble-qt/CMakeLists.txt
|
||||
index d28e3aa5e..7bbf4a63c 100644
|
||||
--- a/src/apps/marble-qt/CMakeLists.txt
|
||||
+++ b/src/apps/marble-qt/CMakeLists.txt
|
||||
@@ -48,7 +48,7 @@ if(STATIC_BUILD)
|
||||
endif(STATIC_BUILD)
|
||||
|
||||
if(WIN32)
|
||||
-install (TARGETS marble-qt RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
|
||||
+ install (TARGETS marble-qt RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tools/marble)
|
||||
else(WIN32)
|
||||
if (APPLE)
|
||||
# No need for this when installing to a bundle
|
||||
diff --git a/src/lib/astro/CMakeLists.txt b/src/lib/astro/CMakeLists.txt
|
||||
index 5e1afd60f..fc53985f4 100644
|
||||
--- a/src/lib/astro/CMakeLists.txt
|
||||
+++ b/src/lib/astro/CMakeLists.txt
|
||||
@@ -50,7 +50,7 @@ target_include_directories(astro
|
||||
|
||||
# choose the correct target install library path
|
||||
if(WIN32)
|
||||
- INSTALL(TARGETS astro EXPORT AstroTargets RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} ARCHIVE DESTINATION lib)
|
||||
+ INSTALL(TARGETS astro EXPORT AstroTargets RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
|
||||
elseif(APPLE)
|
||||
INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
|
||||
else()
|
||||
diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
|
||||
index 7d27be94b..f1f377967 100644
|
||||
--- a/src/lib/marble/CMakeLists.txt
|
||||
+++ b/src/lib/marble/CMakeLists.txt
|
||||
@@ -448,7 +448,7 @@ target_include_directories(marblewidget
|
||||
|
||||
# choose the correct target install library path
|
||||
if(WIN32)
|
||||
- install(TARGETS marblewidget EXPORT MarbleTargets RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} ARCHIVE DESTINATION lib)
|
||||
+ install(TARGETS marblewidget EXPORT MarbleTargets RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
|
||||
elseif(APPLE)
|
||||
install(TARGETS marblewidget LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib)
|
||||
else()
|
||||
diff --git a/src/lib/marble/declarative/CMakeLists.txt b/src/lib/marble/declarative/CMakeLists.txt
|
||||
index dd5d519c4..482a02ad5 100644
|
||||
--- a/src/lib/marble/declarative/CMakeLists.txt
|
||||
+++ b/src/lib/marble/declarative/CMakeLists.txt
|
||||
@@ -53,7 +53,7 @@ if(Qt5Positioning_FOUND)
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
- install(TARGETS marbledeclarative RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} ARCHIVE DESTINATION lib)
|
||||
+ install(TARGETS marbledeclarative RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
|
||||
else()
|
||||
install(TARGETS marbledeclarative LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
endif()
|
||||
diff --git a/src/plugins/positionprovider/CMakeLists.txt b/src/plugins/positionprovider/CMakeLists.txt
|
||||
index 85591098e..87011876e 100644
|
||||
index ec2ba1a..cc8e52e 100644
|
||||
--- a/src/plugins/positionprovider/CMakeLists.txt
|
||||
+++ b/src/plugins/positionprovider/CMakeLists.txt
|
||||
@@ -12,12 +12,12 @@ find_package(Qt5 ${REQUIRED_QT_VERSION}
|
||||
COMPONENTS
|
||||
OPTIONAL_COMPONENTS
|
||||
Positioning
|
||||
)
|
||||
-marble_set_package_properties( Qt5Positioning PROPERTIES DESCRIPTION "a collection of APIs and frameworks" )
|
||||
@ -88,7 +27,7 @@ index 85591098e..87011876e 100644
|
||||
-endif()
|
||||
+#marble_set_package_properties( Qt5Positioning PROPERTIES DESCRIPTION "a collection of APIs and frameworks" )
|
||||
+#marble_set_package_properties( Qt5Positioning PROPERTIES URL "https://www.qt.io/developers/" )
|
||||
+#arble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL PURPOSE "position information via Qt5Positioning" )
|
||||
+#marble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL PURPOSE "position information via Qt5Positioning" )
|
||||
+#if(Qt5Positioning_FOUND)
|
||||
+# ADD_SUBDIRECTORY( qtpositioning )
|
||||
+#endif()
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
"name": "marble",
|
||||
"version-string": "19.08.2",
|
||||
"port-version": 3,
|
||||
"version-string": "22.04.0",
|
||||
"description": "Marble KDE library",
|
||||
"homepage": "https://marble.kde.org",
|
||||
"license": "LGPL-2.1-or-later",
|
||||
"supports": "windows & x64 & !static",
|
||||
"dependencies": [
|
||||
"qt5-base",
|
||||
|
||||
@ -4405,8 +4405,8 @@
|
||||
"port-version": 2
|
||||
},
|
||||
"marble": {
|
||||
"baseline": "19.08.2",
|
||||
"port-version": 3
|
||||
"baseline": "22.04.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"marl": {
|
||||
"baseline": "2022-03-02",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "7a6e4d655adaa7043e8b347841b11472c9b36a6a",
|
||||
"version-string": "22.04.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "eb15f05858eaff46b5d7b142d3c874f889d26557",
|
||||
"version-string": "19.08.2",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user