Skip to content

Commit

Permalink
HPCC-31380 Bump vcpkg versions to latest
Browse files Browse the repository at this point in the history
Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
  • Loading branch information
GordonSmith committed Mar 1, 2024
1 parent 193e658 commit 724d757
Show file tree
Hide file tree
Showing 8 changed files with 242 additions and 22 deletions.
9 changes: 0 additions & 9 deletions .github/workflows/build-vcpkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:
os:
type: choice
options:
- 'ubuntu-23.10'
- 'ubuntu-22.04'
- 'ubuntu-20.04'
- 'centos-8'
Expand Down Expand Up @@ -185,11 +184,3 @@ jobs:
cmake-configuration-ex: '-DUSE_CPPUNIT=OFF -DCLIENTTOOLS_ONLY=ON -DINCLUDE_PLUGINS=OFF -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DSUPPRESS_CASSANDRAEMBED=ON -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF'
secrets: inherit

build-gh_runner-macos-11:
if: ${{ contains('schedule,push', github.event_name) }}
uses: ./.github/workflows/build-gh_runner.yml
with:
os: macos-11
build-type: 'Release'
cmake-configuration-ex: '-DUSE_CPPUNIT=OFF -DCLIENTTOOLS_ONLY=ON -DINCLUDE_PLUGINS=OFF -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DSUPPRESS_CASSANDRAEMBED=ON -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF'
secrets: inherit
220 changes: 220 additions & 0 deletions CMakePresets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
{
"version": 3,
"cmakeMinimumRequired": {
"major": 3,
"minor": 22,
"patch": 1
},
"configurePresets": [
{
"name": "default"
},
{
"name": "vcpkg",
"displayName": "vcpkg",
"toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
"binaryDir": "${sourceDir}/build",
"installDir": "${sourceDir}/build/stage",
"cacheVariables": {},
"hidden": true
},
{
"name": "ninja",
"generator": "Ninja",
"hidden": true
},
{
"name": "debug",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
},
"hidden": true
},
{
"name": "release",
"binaryDir": "${sourceDir}/build/Release",
"installDir": "${sourceDir}/build/Release/stage",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
},
"hidden": true
},
{
"name": "relwithdebinfo",
"binaryDir": "${sourceDir}/build/RelWithDebInfo",
"installDir": "${sourceDir}/build/RelWithDebInfo/stage",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
},
"hidden": true
},
{
"name": "ubuntu",
"cacheVariables": {
"USE_OPTIONAL": "OFF",
"USE_CPPUNIT": "ON",
"INCLUDE_PLUGINS": "ON",
"SUPPRESS_V8EMBED": "ON",
"SUPPRESS_REMBED": "ON"
},
"hidden": true
},
{
"name": "windows",
"cacheVariables": {
"USE_OPTIONAL": "OFF",
"CLIENTTOOLS_ONLY": "ON",
"USE_AZURE": "OFF",
"USE_CASSANDRA": "OFF",
"USE_JAVA": "OFF",
"USE_OPENLDAP": "OFF"
},
"hidden": true
},
{
"name": "ubuntu-ninja",
"inherits": [
"vcpkg",
"ninja",
"ubuntu"
]
},
{
"name": "ubuntu-ninja-debug",
"inherits": [
"ubuntu-ninja",
"debug"
]
},
{
"name": "ubuntu-ninja-debug-minimal",
"inherits": [
"ubuntu-ninja",
"debug"
],
"cacheVariables": {
"USE_CPPUNIT": "OFF",
"INCLUDE_PLUGINS": "OFF"
}
},
{
"name": "ubuntu-ninja-release",
"inherits": [
"ubuntu-ninja",
"release"
]
},
{
"name": "ubuntu-ninja-relwithdebinfo",
"inherits": [
"ubuntu-ninja",
"relwithdebinfo"
]
},
{
"name": "VS-16",
"generator": "Visual Studio 16 2019",
"architecture": {
"strategy": "set",
"value": "x64"
},
"hidden": true
},
{
"name": "VS-17",
"generator": "Visual Studio 17 2022",
"architecture": {
"strategy": "set",
"value": "x64"
},
"toolset": {
"strategy": "set",
"value": "host=x64"
},
"hidden": true
},
{
"name": "vcpkg-VS-16",
"inherits": [
"vcpkg",
"windows",
"VS-16"
]
},
{
"name": "vcpkg-VS-17",
"inherits": [
"vcpkg",
"windows",
"VS-17"
]
}
],
"buildPresets": [
{
"name": "ninja-linux",
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Linux"
},
"hidden": true,
"nativeToolOptions": []
},
{
"name": "Ninja-Linux-Debug",
"inherits": "Ninja-Linux",
"configuration": "Debug"
},
{
"name": "Ninja-Linux-Release",
"inherits": "Ninja-Linux",
"configuration": "Release"
},
{
"name": "VS-16-Debug",
"configurePreset": "vcpkg-VS-16",
"configuration": "Debug",
"jobs": 0,
"nativeToolOptions": [
"-m"
]
},
{
"name": "VS-16-Release",
"configurePreset": "vcpkg-VS-16",
"configuration": "Release",
"jobs": 0,
"nativeToolOptions": [
"-m"
]
},
{
"name": "VS-17-Debug",
"configurePreset": "vcpkg-VS-17",
"configuration": "Debug",
"jobs": 0,
"nativeToolOptions": [
"-m"
]
},
{
"name": "VS-17-Release",
"configurePreset": "vcpkg-VS-17",
"configuration": "Release",
"jobs": 0,
"nativeToolOptions": [
"-m"
]
},
{
"name": "VS-17-RelWithDebInfo",
"configurePreset": "vcpkg-VS-17",
"configuration": "RelWithDebInfo",
"jobs": 0,
"nativeToolOptions": [
"-m"
]
}
]
}
9 changes: 5 additions & 4 deletions cmake_modules/vcpkg.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ if ("${VCPKG_DONE}" STREQUAL "")
set(VCPKG_FILES_DIR "${CMAKE_BINARY_DIR}" CACHE STRING "Folder for vcpkg download, build and installed files")
set(CMAKE_TOOLCHAIN_FILE ${HPCC_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake)
set(VCPKG_ROOT ${HPCC_SOURCE_DIR}/vcpkg)
set(VCPKG_OVERLAY_PORTS ${HPCC_SOURCE_DIR}/vcpkg_overlays;${HPCC_SOURCE_DIR}/vcpkg/overlays)
set(VCPKG_OVERLAY_TRIPLETS ${HPCC_SOURCE_DIR}/vcpkg_overlays;${HPCC_SOURCE_DIR}/vcpkg/overlays)
set(VCPKG_INSTALLED_DIR "${VCPKG_FILES_DIR}/vcpkg_installed")
set(VCPKG_INSTALL_OPTIONS "--downloads-root=${VCPKG_FILES_DIR}/vcpkg_downloads;--x-buildtrees-root=${VCPKG_FILES_DIR}/vcpkg_buildtrees;--x-packages-root=${VCPKG_FILES_DIR}/vcpkg_packages")
set(VCPKG_INSTALL_OPTIONS "--x-abi-tools-use-exact-versions;--downloads-root=${VCPKG_FILES_DIR}/vcpkg_downloads;--x-buildtrees-root=${VCPKG_FILES_DIR}/vcpkg_buildtrees;--x-packages-root=${VCPKG_FILES_DIR}/vcpkg_packages")
set(VCPKG_VERBOSE OFF)

if(APPLE OR WIN32)
if(WIN32)
set(VCPKG_TARGET_TRIPLET "x64-windows" CACHE STRING "target triplet")
elseif(APPLE)
set(VCPKG_TARGET_TRIPLET "x64-osx" CACHE STRING "target triplet")
elseif(UNIX)
set(VCPKG_TARGET_TRIPLET "x64-linux-dynamic" CACHE STRING "target triplet")
endif()
Expand Down
1 change: 0 additions & 1 deletion dockerfiles/vcpkg/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ function doBuild() {
# docker run -it --mount source="$(pwd)",target=/hpcc-dev/HPCC-Platform,type=bind,consistency=cached build-ubuntu-22.04:latest bash
}

# doBuild ubuntu-23.10
# doBuild ubuntu-20.04
# doBuild amazonlinux
# doBuild ubuntu-22.04
Expand Down
6 changes: 0 additions & 6 deletions dockerfiles/vcpkg/ubuntu-23.10.dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion vcpkg
Submodule vcpkg updated 4634 files
16 changes: 16 additions & 0 deletions vcpkg-configuration.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"default-registry": {
"kind": "git",
"repository": "https://github.com/microsoft/vcpkg",
"baseline": "fba75d09065fcc76a25dcf386b1d00d33f5175af"
},
"registries": [],
"overlay-ports": [
"./vcpkg_overlays",
"./vcpkg/overlays"
],
"overlay-triplets": [
"./vcpkg_overlays",
"./vcpkg/overlays"
]
}
1 change: 0 additions & 1 deletion vcpkg.json.in
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@
"name": "opentelemetry-cpp",
"default-features": false,
"features": [
"otlp",
"otlp-http",
"otlp-grpc"
]
Expand Down

0 comments on commit 724d757

Please sign in to comment.