early-access version 2853
This commit is contained in:
pineappleEA
27
externals/vcpkg/ports/qttools/fix_static_build.patch
vendored
Executable file
27
externals/vcpkg/ports/qttools/fix_static_build.patch
vendored
Executable file
@@ -0,0 +1,27 @@
|
||||
diff --git a/src/designer/src/components/lib/CMakeLists.txt b/src/designer/src/components/lib/CMakeLists.txt
|
||||
index 53358741f..ce070bd6a 100644
|
||||
--- a/src/designer/src/components/lib/CMakeLists.txt
|
||||
+++ b/src/designer/src/components/lib/CMakeLists.txt
|
||||
@@ -878,7 +878,7 @@ qt_internal_add_resource(DesignerComponents "widgetbox"
|
||||
## Scopes:
|
||||
#####################################################################
|
||||
|
||||
-qt_internal_extend_target(DesignerComponents CONDITION static
|
||||
+qt_internal_extend_target(DesignerComponents CONDITION NOT BUILD_SHARED_LIBS
|
||||
DEFINES
|
||||
QT_DESIGNER_STATIC
|
||||
)
|
||||
diff --git a/src/designer/src/designer/CMakeLists.txt b/src/designer/src/designer/CMakeLists.txt
|
||||
index f786f1dd6..8c635ff14 100644
|
||||
--- a/src/designer/src/designer/CMakeLists.txt
|
||||
+++ b/src/designer/src/designer/CMakeLists.txt
|
||||
@@ -103,8 +103,8 @@ qt_internal_extend_target(designer CONDITION TARGET Qt::PrintSupport
|
||||
PUBLIC_LIBRARIES
|
||||
Qt::PrintSupport
|
||||
)
|
||||
|
||||
-qt_internal_extend_target(designer CONDITION QT_CONFIG___contains___static
|
||||
+qt_internal_extend_target(designer CONDITION NOT BUILD_SHARED_LIBS
|
||||
DEFINES
|
||||
QT_DESIGNER_STATIC
|
||||
)
|
||||
41
externals/vcpkg/ports/qttools/no_src_changes.patch
vendored
Executable file
41
externals/vcpkg/ports/qttools/no_src_changes.patch
vendored
Executable file
@@ -0,0 +1,41 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 20bd474..7b69743 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -187,13 +187,13 @@ endif()
|
||||
if(WIN32)
|
||||
file(TO_NATIVE_PATH ${XXD_COMMAND} XXD_COMMAND)
|
||||
file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css MASTER_FILE)
|
||||
- add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc
|
||||
- COMMAND type ${MASTER_FILE} | "${XXD_COMMAND}" -i > ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc)
|
||||
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc
|
||||
+ COMMAND type ${MASTER_FILE} | "${XXD_COMMAND}" -i > ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc)
|
||||
else()
|
||||
- add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc
|
||||
- COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css | xxd -i > ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc)
|
||||
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc
|
||||
+ COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css | xxd -i > ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc)
|
||||
endif()
|
||||
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE)
|
||||
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE)
|
||||
|
||||
# Tests
|
||||
|
||||
@@ -218,7 +218,7 @@ if (BUILD_TESTING)
|
||||
add_executable(
|
||||
${TEST_NAME}
|
||||
${TEST_LITEHTML}
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc
|
||||
)
|
||||
|
||||
set_target_properties(${TEST_NAME} PROPERTIES
|
||||
@@ -243,7 +243,7 @@ if (BUILD_TESTING)
|
||||
endif()
|
||||
|
||||
# set(TEST_NAME ${PROJECT_NAME}_tests)
|
||||
-# add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc)
|
||||
+# add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc)
|
||||
# set_target_properties(${TEST_NAME} PROPERTIES
|
||||
# CXX_STANDARD 11
|
||||
# C_STANDARD 99
|
||||
151
externals/vcpkg/ports/qttools/portfile.cmake
vendored
Executable file
151
externals/vcpkg/ports/qttools/portfile.cmake
vendored
Executable file
@@ -0,0 +1,151 @@
|
||||
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
|
||||
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
|
||||
|
||||
set(${PORT}_PATCHES )#fix_static_build.patch)
|
||||
|
||||
#TODO check features and setup: (means force features!)
|
||||
|
||||
# -- The following OPTIONAL packages have not been found:
|
||||
|
||||
# * Qt6AxContainer
|
||||
# * Clang
|
||||
# * WrapLibClang (required version >= 8)
|
||||
|
||||
# Configure summary:
|
||||
|
||||
# Qt Tools:
|
||||
# Qt Assistant ........................... yes
|
||||
# QDoc ................................... no
|
||||
# Clang-based lupdate parser ............. no
|
||||
# Qt Designer ............................ yes
|
||||
# Qt Distance Field Generator ............ yes
|
||||
# kmap2qmap .............................. yes
|
||||
# Qt Linguist ............................ yes
|
||||
# Mac Deployment Tool .................... no
|
||||
# pixeltool .............................. yes
|
||||
# qdbus .................................. yes
|
||||
# qev .................................... yes
|
||||
# Qt Attributions Scanner ................ yes
|
||||
# qtdiag ................................. yes
|
||||
# qtpaths ................................ yes
|
||||
# qtplugininfo ........................... yes
|
||||
# Windows deployment tool ................ yes
|
||||
|
||||
# General features:
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
"assistant" FEATURE_assistant
|
||||
"designer" FEATURE_designer
|
||||
"linguist" FEATURE_linguist
|
||||
"qdoc" CMAKE_REQUIRE_FIND_PACKAGE_Clang
|
||||
#"qdoc" CMAKE_REQUIRE_FIND_PACKAGE_WrapLibClang
|
||||
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
|
||||
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6QuickWidgets
|
||||
INVERTED_FEATURES
|
||||
"qdoc" CMAKE_DISABLE_FIND_PACKAGE_Clang
|
||||
"qdoc" CMAKE_DISABLE_FIND_PACKAGE_WrapLibClang
|
||||
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
|
||||
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets
|
||||
)
|
||||
|
||||
set(TOOL_NAMES
|
||||
assistant
|
||||
designer
|
||||
lconvert
|
||||
linguist
|
||||
lprodump
|
||||
lrelease-pro
|
||||
lrelease
|
||||
lupdate-pro
|
||||
lupdate
|
||||
pixeltool
|
||||
qcollectiongenerator
|
||||
qdistancefieldgenerator
|
||||
qhelpgenerator
|
||||
qtattributionsscanner
|
||||
qtdiag
|
||||
qtdiag6
|
||||
qtpaths
|
||||
qtplugininfo
|
||||
qdbus
|
||||
qdbusviewer
|
||||
qdoc
|
||||
)
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
list(APPEND TOOL_NAMES windeployqt)
|
||||
elseif(VCPKG_TARGET_IS_OSX)
|
||||
list(APPEND TOOL_NAMES macdeployqt)
|
||||
endif()
|
||||
|
||||
### Download third_party modules
|
||||
vcpkg_from_git(
|
||||
OUT_SOURCE_PATH SOURCE_PATH_QLITEHTML
|
||||
URL git://code.qt.io/playground/qlitehtml.git # git://code.qt.io/playground/qlitehtml.git
|
||||
REF "${${PORT}_qlitehtml_REF}"
|
||||
FETCH_REF master
|
||||
HEAD_REF master
|
||||
)
|
||||
# port 'litehtml' is not in vcpkg!
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH_LITEHTML
|
||||
REPO litehtml/litehtml
|
||||
REF "${${PORT}_litehtml_REF}"
|
||||
SHA512 "${${PORT}_litehtml_HASH}"
|
||||
HEAD_REF master
|
||||
PATCHES no_src_changes.patch
|
||||
)
|
||||
|
||||
##### qt_install_submodule
|
||||
set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins)
|
||||
set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
|
||||
|
||||
qt_download_submodule(PATCHES ${${PORT}_PATCHES})
|
||||
if(QT_UPDATE_VERSION)
|
||||
return()
|
||||
endif()
|
||||
file(COPY "${SOURCE_PATH_QLITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml")
|
||||
file(COPY "${SOURCE_PATH_LITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml/src/3rdparty/litehtml")
|
||||
|
||||
|
||||
if(_qis_DISABLE_NINJA)
|
||||
set(_opt DISABLE_NINJA)
|
||||
endif()
|
||||
qt_cmake_configure(${_opt}
|
||||
OPTIONS ${FEATURE_OPTIONS}
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=ON
|
||||
OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG}
|
||||
OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE})
|
||||
|
||||
vcpkg_cmake_install(ADD_BIN_TO_PATH)
|
||||
|
||||
qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES})
|
||||
|
||||
qt_install_copyright("${SOURCE_PATH}")
|
||||
|
||||
##### qt_install_submodule
|
||||
|
||||
if(VCPKG_TARGET_IS_OSX)
|
||||
set(OSX_APP_FOLDERS Designer.app Linguist.app pixeltool.app qdbusviewer.app)
|
||||
foreach(_appfolder IN LISTS OSX_APP_FOLDERS)
|
||||
message(STATUS "Moving: ${_appfolder}")
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}")
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}/")
|
||||
endforeach()
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
endif()
|
||||
|
||||
if(NOT QT_IS_LATEST)
|
||||
set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsTargets-debug.cmake")
|
||||
if(EXISTS "${configfile}" AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/windeployqt.exe")
|
||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin")
|
||||
file(READ "${configfile}" _contents)
|
||||
string(REPLACE [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe]] [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat]] _contents "${_contents}")
|
||||
file(WRITE "${configfile}" "${_contents}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
file(GLOB_RECURSE debug_dir "${CURRENT_PACKAGES_DIR}/debug/*")
|
||||
list(LENGTH debug_dir debug_dir_elements)
|
||||
if(debug_dir_elements EQUAL 0)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
|
||||
endif()
|
||||
84
externals/vcpkg/ports/qttools/vcpkg.json
vendored
Executable file
84
externals/vcpkg/ports/qttools/vcpkg.json
vendored
Executable file
@@ -0,0 +1,84 @@
|
||||
{
|
||||
"name": "qttools",
|
||||
"version": "6.3.0",
|
||||
"port-version": 1,
|
||||
"description": "Qt Tools",
|
||||
"homepage": "https://www.qt.io/",
|
||||
"license": null,
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qtbase",
|
||||
"default-features": false
|
||||
},
|
||||
{
|
||||
"name": "qttools",
|
||||
"host": true,
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"assistant",
|
||||
"linguist"
|
||||
]
|
||||
}
|
||||
],
|
||||
"features": {
|
||||
"assistant": {
|
||||
"description": "Build Qt Assistant",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qtbase",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"network",
|
||||
"sql-sqlite"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"designer": {
|
||||
"description": "Build Qt Designer",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qtbase",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"network"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"linguist": {
|
||||
"description": "Build Qt Linguist components",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qttools",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"designer"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"qdoc": {
|
||||
"description": "Build QDoc.",
|
||||
"dependencies": [
|
||||
"llvm"
|
||||
]
|
||||
},
|
||||
"qml": {
|
||||
"description": "Build QML imports",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qtbase",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"gui"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "qtdeclarative",
|
||||
"default-features": false
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
10
externals/vcpkg/ports/qttools/windeployqt.debug.bat
vendored
Executable file
10
externals/vcpkg/ports/qttools/windeployqt.debug.bat
vendored
Executable file
@@ -0,0 +1,10 @@
|
||||
@echo off
|
||||
setlocal enabledelayedexpansion
|
||||
set mypath=%~dp0
|
||||
set mypath=%mypath:~0,-1%
|
||||
set BAKCD=!CD!
|
||||
cd /D %mypath%\..\..\..\debug\bin
|
||||
set PATH=!CD!;%PATH%
|
||||
"%mypath%\windeployqt.exe" --qmake "%mypath%\qmake.debug.bat" %*
|
||||
cd %BAKCD%
|
||||
endlocal
|
||||
Reference in New Issue
Block a user