mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-22 11:00:36 +08:00
36000a1085
* wip commit * refactor openssl ports. * fix issues due to the file movement * qt build succesful. * qtbase finished? * add qttools and qtdeclarative * add EntryPoints to fixup_cmake_targets * add todo * more config fixup * correct entrypoint and remove winmain * format manifest * fix module issues * add extra vars * make qtdeclarative work (x64-windows). -static has problems * some extra cleanup tools start building * refactor code to use common script across ports * remove patch applied twice * remove copy pasta * add remaining qt6 ports * fix a few details * fix the rest * format manifests * add features to qt5compat. * small modification to directories * copy plugins * a bit of cleanup * smaller fixes * format manifest * fix_linux_configure_issue * adding linux features. * dont use quotes around INSTALL_ vars to fix linux build * fix script install on linux * remove bin if empty on all platforms otherwise let vcpkg throw an error * fix syncqt path * fix assimp feature * try to figure you ci failures * fix manifest format * change the head ref to dev add three required upstream cmake patches allow single config builds * fix typo * switch to use FEATURE_ instead of QT_FEATURE * [ZSTD] Update to 1.4.5 * [zstd] fix wrong assert to fix uwp regressions * always install *.pc file. Correct -l flag in pc file * remove any changes to vcpkg_copy_tools * fix orc regression * fix arrow regressions * fix zstd target suffix * fix orc zstd linkage * fix find_package(ZSTD) * fix icu linkage in harfbuzz * install zstd dlls. * skip qt5-base in ci to test qtbase due to conflicts * fix the patch due to a replacement error * add a way for vcpkg_from_github to only download the source archive and return the archive file name. * update everything to beta4. maybe qtdeclarative:x64-windows-static works now? * remove outdated patches * Print the failed condition * more debug messages * fix condition patch * update to beta5 * update vcpkg_from_git to support tags and make output of ref possible. * update ports * add missing qt ports, fix qtbase build * regenerate docs * fix typo * fix imageformats webp * fix qtdeclarative static builds msvc * more fixes * make the rest of qt build succesfully. (only tested x64-windows) * format manifest. * [vcpkg_from_git] new options TAG and OUT_REF - TAG github tag to checkout - OUT_REF github commit id related to tag or ref (useable for automatic updates of ports if used with a version tag) * fix importprefix in qml plugin targets in static builds * fix static qttools build on windows * move qml plugin fix into qtbase * try fixing staqtic build issues. * make comment in qtquickcontrols2 * dont promote targets * fix missing limits include * fix patch * pass options in qtopcua * fix freetype linkage * fix freetype a bit different * fix promotion patch * fix freetype wrapper without " * fix typo in patch * enable build of qtopcua * format manifest for ci to run * retry promotion * try again but explicity not promote Threads::Threads * push patch * [fontconfig] add vcpkg cmake wrapper. * fix empty statement in the wrapper * show files in bin if any * Apply suggestions from code review Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * additional changes due to CR * regenerate docs * qdoc is build if llvm is present. * fix merge issues * fix wayland deps * add qt5-base to skip for static-md * format manifest. * update all qt ports. Lets see which patches need to be fixed/removed * fix some regressions by removing patches no longer necessary. (needs further cleanup to actually remove the patches) * fix qtopcua * make qttools build on osx * fix dependency of qttranslations * fix qtwayland * fix typo * fix case * adjust ci baseline for qtwayland on osx due to missing system libs. * create directory before rename * trying to make osx work * create the directory and move the files * move the removing outside the foreach .... * update to 6.0.2 * remove some outdated patches * qt 6.1.0-beta1 ci testing * remove unused patches * fix a few issues with qt 6.1.0-beta1 qtvirtualkeyboard needs some features. + need to install cmake wrappers from qtimageformats. + move QtAxServer to manual-link * Fix missing qt cmake wrappers for qttools and qtshadertools. * block qt beta ports in CI * turn off beta build in CI * remove outdated patches * skip qt6 beta ports in CI * [gettext] add feature tools. * switch hunspell to configure_make for pc files * switch to manifest * hunspell remove port debug and add comment about tools * setup qtvirtualkeyboard features. * fix manifest format CI * only run wayland on linux * disable pthread detection in gettext on windows * fix hunspell host dependency * formant manifest * - add qt6 prefix - add qt.conf.in - make qtbase depend on itself (host dependency) and see what breaks. * cannot add qt6 to bin folder currently. * try the prefix method - add tools-path to vcpkg_fixup_cmake_targets - add destination to vcpkg_copy_tools * feature refinement * fix tools issues * update baseline * more feature refinement. * be less noise in logs * update version in gettext format-manifest. * add version details * move on to qt version 6.0.3 * build cmake test port against qt6 * move qt5 includes into include/qt5 * ws change in cmake to force rebuild * version stuff * add plugin_config patch * version stuff * use upstream plugin patch for 6.1 * version stuff * update to qt 6.1.0-beta3 * add alignment patch * fix hunspell include path * make the patch depend on architecture * add qbittorrent as a test port * downgrade qbittorrent a bit so that in can run in CI * remove bin in static builds * remove debug folder completly (since it is empty) * copy additional deps required by qtshadertools and qtdeclarative in qtbase to avoid issues with binary chaching. * fix logic * try upstream alignment patch * update baseline * add feature options to qt5compat * update to qt 6.1.0 * version stuff * fix qt.conf (for release builds only) * fix install of missing FindX modules in qtimageformats which where supposed to be fixed upstream but aren't * remove unnecessary patch * version stuff * fix some qt.conf stuff * install some wrappers for debug builds. * fine tuning qt.conf * fix debug windeployqt install but somebody is linking release icudt in debug * fix arm crossbuilds on windows * remove tools default line * version stuff * add missing host dependencies. * fix windeploy target correctly for debug * fix cmake arm builds. * some batch improvements * run qmake.debug.bat for debug builds. * version stuff * unconditionally include the patch in qtvirtualkeyboard * version stuff * more host dependencies * version stuff * more host deps * version stuff * fix qtactiveqt * version stuff * suppress batch skript output * version stuff * Apply CR changes * version stuff * newline attack * update qbittorrent test port and newline... * version stuff again * switch to version-semver * version stuff * remove qbittorrent test_port because - easier than rewriting history - qt6svg usage will probably be tested by paraview/vtk in the future Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
76 lines
2.8 KiB
CMake
76 lines
2.8 KiB
CMake
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
|
|
vcpkg_from_gitlab(
|
|
GITLAB_URL https://gitlab.kitware.com/
|
|
OUT_SOURCE_PATH SOURCE_PATH
|
|
REPO cmake/cmake
|
|
REF
|
|
b7b0fb430397bafae4a7bd80b41d474c91a3b7f3
|
|
SHA512
|
|
3b0de26910bceaf4bc6546255bada4c502cd0fd32f44bc28b067f347c09d028c175a3243551bbe4bb64bcf312df9ff827e8fdbcb0b34a12e1ce4a26ba0799ee2
|
|
HEAD_REF master
|
|
)
|
|
set(OPTIONS)
|
|
if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP)
|
|
list(APPEND OPTIONS -DBUILD_CursesDialog=ON)
|
|
else()
|
|
list(APPEND OPTIONS -DBUILD_CursesDialog=OFF)
|
|
endif()
|
|
|
|
if(VCPKG_CROSSCOMPILING)
|
|
list(APPEND OPTIONS -DQt6CoreTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6CoreTools)
|
|
list(APPEND OPTIONS -DQt6WidgetsTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6WidgetsTools)
|
|
list(APPEND OPTIONS -DQt6GuiTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6GuiTools)
|
|
if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) # Remove if PR #16111 is merged
|
|
list(APPEND OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows)
|
|
endif()
|
|
endif()
|
|
|
|
vcpkg_configure_cmake(
|
|
SOURCE_PATH ${SOURCE_PATH}
|
|
PREFER_NINJA
|
|
OPTIONS
|
|
${OPTIONS}
|
|
-DBUILD_TESTING=OFF
|
|
#-DCMAKE_USE_SYSTEM_LIBRARIES=ON
|
|
-DCMAKE_USE_SYSTEM_LIBARCHIVE=ON
|
|
-DCMAKE_USE_SYSTEM_CURL=ON
|
|
-DCMAKE_USE_SYSTEM_EXPAT=ON
|
|
-DCMAKE_USE_SYSTEM_ZLIB=ON
|
|
-DCMAKE_USE_SYSTEM_BZIP2=ON
|
|
-DCMAKE_USE_SYSTEM_ZSTD=ON
|
|
-DCMAKE_USE_SYSTEM_FORM=ON
|
|
-DCMAKE_USE_SYSTEM_JSONCPP=ON
|
|
-DCMAKE_USE_SYSTEM_LIBRHASH=OFF # not yet in VCPKG
|
|
-DCMAKE_USE_SYSTEM_LIBUV=ON
|
|
-DBUILD_QtDialog=ON # Just to test Qt with CMake
|
|
-DCMake_QT_MAJOR_VERSION:STRING=6
|
|
)
|
|
|
|
vcpkg_install_cmake(ADD_BIN_TO_PATH)
|
|
vcpkg_copy_pdbs()
|
|
|
|
if(NOT VCPKG_TARGET_IS_OSX)
|
|
set(_tools cmake cmake-gui ctest cpack)
|
|
if(VCPKG_TARGET_IS_WINDOWS)
|
|
list(APPEND _tools cmcldeps)
|
|
endif()
|
|
if(BUILD_CURSES_DIALOG)
|
|
list(APPEND _tools ccmake)
|
|
endif()
|
|
vcpkg_copy_tools(TOOL_NAMES ${_tools} AUTO_CLEAN)
|
|
else()
|
|
# On OSX everything is within a CMake.app folder
|
|
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
|
|
file(RENAME "${CURRENT_PACKAGES_DIR}/CMake.app" "${CURRENT_PACKAGES_DIR}/tools/CMake.app")
|
|
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/CMake.app")
|
|
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/debug)
|
|
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/CMake.app" "${CURRENT_PACKAGES_DIR}/tools/debug/CMake.app")
|
|
endif()
|
|
endif()
|
|
|
|
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
|
|
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
|
|
|
|
# Handle copyright
|
|
configure_file(${SOURCE_PATH}/Copyright.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
|