mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-29 11:41:36 +08:00
1d8f0acc9c
==== Changes Related to manifests ====
* Add the `manifests` feature flag
* This only says whether we look for a `vcpkg.json` in the cwd, not
whether we support parsing manifests (for ports, for example)
* Changes to the manifests RFC
* `"authors"` -> `"maintainers"`
* `--x-classic-mode` -> `-manifests` \in `vcpkg_feature_flags`
* reserve `"core"` in addition to `"default"`, since that's already
reserved for features
* Add a small helper note about what identifiers must look like
* `<license-string>`: SPDX v3.8 -> v3.9
* `"feature"."description"` is allowed to be an array of strings as well
* `"version"` -> `"version-string"` for forward-compat with versions
RFC
* Add the `--feature-flags` option
* Add the ability to turn off feature flags via passing
`-<feature-flag>` to `VCPKG_FEATURE_FLAGS` or `--feature-flags`
* Add CMake toolchain support for manifests
* Requires either:
* a feature flag of `manifests` in either `Env{VCPKG_FEATURE_FLAGS}`
or `VCPKG_FEATURE_FLAGS`
* Passing the `VCPKG_ENABLE_MANIFESTS` option
* The toolchain will install your packages to
`${VCPKG_MANIFEST_DIR}/vcpkg_installed`.
* Add MSBuild `vcpkg integrate install` support for manifests
* Requires `VcpkgEnableManifest` to be true
* `vcpkg create` creates a port that has a `vcpkg.json` instead of a
`CONTROL`
* argparse, abseil, 3fd, and avisynthplus ports switched to manifest
from CONTROL
* Add support for `--x-manifest-root`, as well as code for finding it if
not passed
* Add support for parsing manifests!
* Add a filesystem lock!
==== Important Changes which are somewhat unrelated to manifests ====
* Rename `logicexpression.{h,cpp}` to `platform-expression.{h,cpp}`
* Add `PlatformExpression` type which takes the place of the old logic
expression
* Split the parsing of platform expressions from checking whether
they're true or not
* Eagerly parse PlatformExpressions as opposed to leaving them as
strings
* Add checking for feature flag consistency
* i.e., if `-binarycaching` is passed, you shouldn't be passing
`--binarysource`
* Add the `Json::Reader` type which, with the help of user-defined
visitors, converts JSON to your internal type
* VcpkgArgParser: place the switch names into a constant as opposed to
using magic constants
* In general update the parsing code so that this ^ works
* Add `Port-Version` fields to CONTROL files
* This replaces the existing practice of
`Version: <my-version>-<port-version>`
==== Smaller changes ====
* small drive-by cleanups to some CMake
* `${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}` ->
`${CURRENT_INSTALLED_DIR}`
* Remove `-analyze` when compiling with clang-cl, since that's not a
supported flag (vcpkg's build system)
* Add a message about which compiler is detected by vcpkg's build
system machinery
* Fix `Expected::then`
* Convert `""` to `{}` for `std::string` and `fs::path`, to avoid a
`strlen` (additionally, `.empty()` instead of `== ""`, and `.clear()`)
* Add `Strings::strto` which converts strings to numeric types
* Support built-in arrays and `StringView` for `Strings::join`
* Add `operator<` and friends to `StringView`
* Add `substr` to `StringView`
* SourceParagraphParser gets some new errors
102 lines
4.8 KiB
CMake
102 lines
4.8 KiB
CMake
function(find_qt_mkspec TARGET_PLATFORM_MKSPEC_OUT HOST_PLATFORM_MKSPEC_OUT EXT_HOST_TOOLS_OUT)
|
|
## Figure out QTs target mkspec
|
|
if(NOT DEFINED VCPKG_QT_TARGET_MKSPEC)
|
|
message(STATUS "Figuring out qt target mkspec. Target arch ${VCPKG_TARGET_ARCHITECTURE}")
|
|
if(VCPKG_TARGET_IS_WINDOWS)
|
|
if(VCPKG_TARGET_IS_UWP)
|
|
if(VCPKG_PLATFORM_TOOLSET STREQUAL "v140")
|
|
set(msvc_year "2015")
|
|
elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
|
|
set(msvc_year "2017")
|
|
elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v142")
|
|
set(msvc_year "2019")
|
|
else()
|
|
message(FATAL_ERROR "No target mkspec found!")
|
|
endif()
|
|
set(_tmp_targ_out "winrt-${VCPKG_TARGET_ARCHITECTURE}-msvc${msvc_year}")
|
|
else()
|
|
if("${VCPKG_TARGET_ARCHITECTURE}" MATCHES "arm64")
|
|
message(STATUS "Figuring out arm64")
|
|
set(_tmp_targ_out "win32-arm64-msvc2017") #mkspec does not have anything defined related to msvc2017 so this should work
|
|
else()
|
|
set(_tmp_targ_out "win32-msvc")
|
|
endif()
|
|
endif()
|
|
elseif(VCPKG_TARGET_IS_LINUX)
|
|
set(_tmp_targ_out "linux-g++" )
|
|
elseif(VCPKG_TARGET_IS_OSX)
|
|
set(_tmp_targ_out "macx-clang") # switch to macx-g++ since vcpkg requires g++ to compile any way?
|
|
endif()
|
|
else()
|
|
set(_tmp_targ_out ${VCPKG_QT_TARGET_MKSPEC})
|
|
endif()
|
|
message(STATUS "Target mkspec set to: ${_tmp_targ_out}")
|
|
set(${TARGET_PLATFORM_MKSPEC_OUT} ${_tmp_targ_out} PARENT_SCOPE)
|
|
|
|
## Figure out QTs host mkspec
|
|
if(NOT DEFINED VCPKG_QT_HOST_MKSPEC)
|
|
#if(WIN32)
|
|
# set(_tmp_host_out "win32-msvc")
|
|
#elseif("${CMAKE_HOST_SYSTEM}" STREQUAL "Linux")
|
|
# set(_tmp_host_out "linux-g++")
|
|
#elseif("${CMAKE_HOST_SYSTEM}" STREQUAL "Darwin")
|
|
# set(_tmp_host_out "macx-clang")
|
|
#endif()
|
|
if(DEFINED _tmp_host_out)
|
|
message(STATUS "Host mkspec set to: ${_tmp_host_out}")
|
|
else()
|
|
message(STATUS "Host mkspec not set. Qt's own buildsystem will try to figure out the host system")
|
|
endif()
|
|
else()
|
|
set(_tmp_host_out ${VCPKG_QT_HOST_MKSPEC})
|
|
endif()
|
|
|
|
if(DEFINED _tmp_host_out)
|
|
set(${HOST_PLATFORM_MKSPEC_OUT} ${_tmp_host_out} PARENT_SCOPE)
|
|
endif()
|
|
|
|
## Figure out VCPKG qt-tools directory for the port.
|
|
if(NOT DEFINED VCPKG_QT_HOST_TOOLS_ROOT AND DEFINED VCPKG_QT_HOST_PLATFORM) ## Root dir of the required host tools
|
|
if(NOT "${_tmp_host_out}" MATCHES "${_tmp_host_out}")
|
|
if(CMAKE_HOST_WIN32)
|
|
|
|
if($ENV{PROCESSOR_ARCHITECTURE} MATCHES "[aA][rR][mM]64")
|
|
list(APPEND _test_triplets arm64-windows)
|
|
elseif($ENV{PROCESSOR_ARCHITECTURE} MATCHES "[aA][mM][dD]64")
|
|
list(APPEND _test_triplets x64-windows x64-windows-static)
|
|
list(APPEND _test_triplets x86-windows x86-windows-static)
|
|
elseif($ENV{PROCESSOR_ARCHITECTURE} MATCHES "x86")
|
|
list(APPEND _test_triplets x86-windows x86-windows-static)
|
|
else()
|
|
message(FATAL_ERROR "Unknown host processor! Host Processor $ENV{PROCESSOR_ARCHITECTURE}")
|
|
endif()
|
|
elseif(CMAKE_HOST_SYSTEM STREQUAL "Linux")
|
|
list(APPEND _test_triplets "x64-linux")
|
|
elseif(CMAKE_HOST_SYSTEM STREQUAL "Darwin")
|
|
list(APPEND _test_triplets "x64-osx")
|
|
else()
|
|
endif()
|
|
foreach(_triplet ${_test_triplets})
|
|
find_program(QMAKE_PATH qmake PATHS ${VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5/bin NO_DEFAULT_PATHS)
|
|
message(STATUS "Checking: ${VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5/bin. ${QMAKE_PATH}")
|
|
if(QMAKE_PATH)
|
|
set(_tmp_host_root "${VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5")
|
|
set(_tmp_host_qmake ${QMAKE_PATH} PARENT_SCOPE)
|
|
message(STATUS "Qt host tools root dir within vcpkg: ${_tmp_host_root}")
|
|
break()
|
|
endif()
|
|
endforeach()
|
|
if(NOT DEFINED _tmp_host_root)
|
|
message(FATAL_ERROR "Unable to locate required host tools. Please define VCPKG_QT_HOST_TOOLS_ROOT to the required root dir of the host tools")
|
|
endif()
|
|
endif()
|
|
else()
|
|
set(_tmp_host_root ${VCPKG_QT_HOST_TOOLS_ROOT})
|
|
endif()
|
|
|
|
if(DEFINED _tmp_host_root)
|
|
set(${EXT_HOST_TOOLS_OUT} ${_tmp_host_root} PARENT_SCOPE)
|
|
endif()
|
|
|
|
endfunction()
|