[aws-sdk-cpp] Remove compute_build_only.cmake. (#34384)

This commit is contained in:
Theodore Tsirpanis 2023-10-13 06:11:35 +03:00 committed by GitHub
parent 2f94f0e5a6
commit 19db77b44e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 228 additions and 1325 deletions

File diff suppressed because it is too large Load Diff

View File

@ -9,7 +9,6 @@ $ErrorActionPreference = "Stop"
$ManifestIn = "$PortDirectory/vcpkg.in.json"
$ManifestOut = "$PortDirectory/vcpkg.json"
$CMakeFragmentFile = "$PortDirectory/compute_build_only.cmake"
$ExtractedSources = "${env:TEMP}/aws-sdk-cpp-generateFeatures-$SourcesRef"
if (-not (Test-Path $ExtractedSources)) {
@ -31,8 +30,6 @@ $manifest | Add-Member `
-NotePropertyValue 'Automatically generated by generateFeatures.ps1'
$manifest | Add-Member -NotePropertyName 'features' -NotePropertyValue @{}
$cmakefragmenttext = @("# Automatically generated by generateFeatures.ps1")
function GetDescription($dir, $modulename)
{
if (Test-Path "$dir\CMakeLists.txt")
@ -69,17 +66,8 @@ foreach ($subfolder in $subfolders)
}
$manifest.features.Add("$lowermodulename", $featureObj)
$cmakefragmenttext += @(
"if(`"$lowermodulename`" IN_LIST FEATURES)",
" list(APPEND BUILD_ONLY $modulename)",
"endif()"
)
}
[IO.File]::WriteAllText($ManifestOut, (ConvertTo-Json -Depth 10 -InputObject $manifest))
Write-Verbose ($cmakefragmenttext -join "`n")
[IO.File]::WriteAllText($CMakeFragmentFile, ($cmakefragmenttext -join "`n") +"`n")
& $vcpkg format-manifest --feature-flags=-manifests $ManifestOut

View File

@ -29,8 +29,6 @@ else()
set(rpath "\$ORIGIN")
endif()
set(BUILD_ONLY core)
include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
@ -39,7 +37,7 @@ vcpkg_cmake_configure(
"-DENABLE_UNITY_BUILD=ON"
"-DENABLE_TESTING=OFF"
"-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}"
"-DBUILD_ONLY=${BUILD_ONLY}"
"-DBUILD_ONLY=${FEATURES}"
"-DBUILD_DEPS=OFF"
"-DBUILD_SHARED_LIBS=OFF"
"-DAWS_SDK_WARNINGS_ARE_ERRORS=OFF"
@ -48,7 +46,7 @@ vcpkg_cmake_configure(
)
vcpkg_cmake_install()
foreach(TARGET IN LISTS BUILD_ONLY)
foreach(TARGET IN LISTS FEATURES)
vcpkg_cmake_config_fixup(PACKAGE_NAME "aws-cpp-sdk-${TARGET}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
endforeach()
vcpkg_cmake_config_fixup(PACKAGE_NAME "AWSSDK" CONFIG_PATH "lib/cmake/AWSSDK")

View File

@ -1,6 +1,7 @@
{
"name": "aws-sdk-cpp",
"version": "1.11.160",
"port-version": 1,
"description": "AWS SDK for C++",
"homepage": "https://github.com/aws/aws-sdk-cpp",
"license": "Apache-2.0",

View File

@ -2,6 +2,7 @@
"$note": "Automatically generated by generateFeatures.ps1",
"name": "aws-sdk-cpp",
"version": "1.11.169",
"port-version": 1,
"description": "AWS SDK for C++",
"homepage": "https://github.com/aws/aws-sdk-cpp",
"license": "Apache-2.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5c0ad10a852e7facc0cea54e3990f16e0cb1ea8b",
"version": "1.11.169",
"port-version": 1
},
{
"git-tree": "714b1b2815e2a3f57c79c8703a9cdc9892240acd",
"version": "1.11.169",

View File

@ -402,7 +402,7 @@
},
"aws-sdk-cpp": {
"baseline": "1.11.169",
"port-version": 0
"port-version": 1
},
"azmq": {
"baseline": "2023-03-23",