mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 22:27:49 +08:00
147027390b
* [Qt6] update to 6.2.4
* adjust patches
* more fixes
* more CMAKE_REQUIRE_FIND_PACKAGE
* fix configure?
* cannot require cmake not config stuff.
* more REQUIRE removals
* adjust required stuff
* more modules.
* less require stuff
* disable env patch for now and silent the require maybe unused. warnings
* different approach
* fix case ?
* fix linux builds
* more stuff to not force in vcpkg
* reenable env patch
* only use env patch on windows.
* reenable qtwebengine. Maybe the ICE was fixed?
* Revert "reenable qtwebengine. Maybe the ICE was fixed?"
This reverts commit 5dc3ca88c1.
* version stuff
Co-authored-by: Alexander Neumann <you@example.com>
63 lines
2.4 KiB
CMake
63 lines
2.4 KiB
CMake
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
|
|
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
|
|
|
|
set(${PORT}_PATCHES
|
|
bump-cmake-version.patch
|
|
wrapper-fixes.patch
|
|
)
|
|
|
|
set(TOOL_NAMES appman
|
|
appman-controller
|
|
appman-dumpqmltypes
|
|
appman-packager
|
|
appman-qmltestrunner
|
|
appman-launcher-qml
|
|
package-uploader
|
|
)
|
|
|
|
qt_download_submodule(PATCHES ${${PORT}_PATCHES})
|
|
if(QT_UPDATE_VERSION)
|
|
return()
|
|
endif()
|
|
|
|
set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins)
|
|
set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
|
|
qt_cmake_configure(${_opt}
|
|
OPTIONS
|
|
-DINPUT_libarchive=system
|
|
-DINPUT_libyaml=system
|
|
-DFEATURE_am_system_libyaml=ON
|
|
-DFEATURE_am_system_libarchive=ON
|
|
OPTIONS_DEBUG
|
|
OPTIONS_RELEASE)
|
|
|
|
### Need to fix one post-build.bat; Couldn't find the place where it gets generated!
|
|
if(VCPKG_TARGET_IS_WINDOWS)
|
|
set(scriptfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tools/dumpqmltypes/CMakeFiles/appman-dumpqmltypes.dir/post-build.bat")
|
|
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" CURRENT_INSTALLED_DIR_NATIVE)
|
|
if(EXISTS "${scriptfile}")
|
|
vcpkg_replace_string("${scriptfile}" "${CURRENT_INSTALLED_DIR_NATIVE}\\bin" "${CURRENT_INSTALLED_DIR_NATIVE}\\debug\\bin")
|
|
endif()
|
|
endif()
|
|
vcpkg_cmake_install(ADD_BIN_TO_PATH)
|
|
|
|
qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES})
|
|
|
|
qt_install_copyright("${SOURCE_PATH}")
|
|
|
|
# Switch to a more complicated script due to the one post-build script which needed fixing after configure.
|
|
# If somebody finds out how/where post-build.bat gets generated please fix it there instead.
|
|
#qt_install_submodule(PATCHES ${${PORT}_PATCHES}
|
|
# TOOL_NAMES ${TOOL_NAMES}
|
|
# CONFIGURE_OPTIONS
|
|
# --trace-expand
|
|
# -DINPUT_libarchive=system
|
|
# -DINPUT_libyaml=system
|
|
# -DFEATURE_am_system_libyaml=ON
|
|
# -DFEATURE_am_system_libarchive=ON
|
|
# CONFIGURE_OPTIONS_RELEASE
|
|
# CONFIGURE_OPTIONS_DEBUG
|
|
# )
|
|
|
|
set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) #Debug tracing libraries are only build if CMAKE_BUILD_TYPE is equal to Debug
|