mirror of https://github.com/microsoft/vcpkg.git
[qt-advanced-docking-system] Upgrade to Qt6 (#27464)
* update port * format-manifest * version stuff * version stuff * fix arm windows * version stuff * v db
This commit is contained in:
parent
16a892c1fb
commit
d7787aa89b
|
|
@ -1,23 +1,35 @@
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO githubuser0xFFFF/Qt-Advanced-Docking-System
|
||||
REF d5fefaa35fb53e299b7f39b0d8f541954c710d94 #v3.8.2
|
||||
REF d5fefaa35fb53e299b7f39b0d8f541954c710d94
|
||||
SHA512 fcafee34d4d5365b3677c648e0d9a1ea8afd5463ca682ae19b10661490aca44d4f010ba768ed9c639b8ada10106be7aff336c2b7b42f10dc12db6b51988b4e22
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
config_changes.patch
|
||||
qt.patch
|
||||
)
|
||||
|
||||
if(VCPKG_CROSSCOMPILING)
|
||||
list(APPEND _qarg_OPTIONS "-DQT_HOST_PATH=${CURRENT_HOST_INSTALLED_DIR}")
|
||||
list(APPEND _qarg_OPTIONS "-DQT_HOST_PATH_CMAKE_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share")
|
||||
endif()
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
${_qarg_OPTIONS}
|
||||
-DBUILD_EXAMPLES=OFF
|
||||
-DADS_VERSION=3.8.2
|
||||
-DADS_VERSION=${VERSION}
|
||||
-DQT_VERSION_MAJOR=6
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE
|
||||
-DBUILD_STATIC=${BUILD_STATIC}
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
CMAKE_DISABLE_FIND_PACKAGE_Qt5
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup(PACKAGE_NAME "qtadvanceddocking" CONFIG_PATH "lib/cmake/qtadvanceddocking")
|
||||
|
||||
vcpkg_cmake_config_fixup(PACKAGE_NAME qtadvanceddocking CONFIG_PATH lib/cmake/qtadvanceddocking)
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 653546544..2091bce16 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -1,6 +1,5 @@
|
||||
cmake_minimum_required(VERSION 3.5)
|
||||
project(QtAdvancedDockingSystem LANGUAGES CXX VERSION ${VERSION_SHORT})
|
||||
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
|
||||
find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)
|
||||
if (UNIX AND NOT APPLE)
|
||||
include_directories(${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS})
|
||||
|
|
@ -1,18 +1,19 @@
|
|||
{
|
||||
"name": "qt-advanced-docking-system",
|
||||
"version": "3.8.2",
|
||||
"port-version": 1,
|
||||
"description": "Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio",
|
||||
"homepage": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System",
|
||||
"license": "LGPL-2.1-only",
|
||||
"dependencies": [
|
||||
"bzip2",
|
||||
{
|
||||
"name": "qt5-base",
|
||||
"default-features": false
|
||||
},
|
||||
{
|
||||
"name": "qt5-x11extras",
|
||||
"platform": "!windows"
|
||||
"name": "qtbase",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"gui",
|
||||
"widgets"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
|
|
|
|||
|
|
@ -6014,7 +6014,7 @@
|
|||
},
|
||||
"qt-advanced-docking-system": {
|
||||
"baseline": "3.8.2",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"qt3d": {
|
||||
"baseline": "6.3.2",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "cdafc879bca2bc737f24557664c1384982bb1fe3",
|
||||
"version": "3.8.2",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "faedc79b62016f2cfc3c47ecc16db714448daa48",
|
||||
"version": "3.8.2",
|
||||
|
|
|
|||
Loading…
Reference in New Issue