зеркало из https://github.com/microsoft/vcpkg.git
[vcpkg baseline][opencensus-cpp] Set cxx standard to 14 for compatibility with abseil (#25735)
* {vcpkg baseline] Set cxx standard to 14 for compatibility with abseil * Remove from CI baseline * version * license * version
This commit is contained in:
Родитель
204949bc59
Коммит
6118049642
|
@ -1,3 +1,16 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0ecec53..07162ed 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -29,7 +29,7 @@ project(
|
||||
option(FUZZER "Either OFF or e.g. -fsanitize=fuzzer,address" OFF)
|
||||
|
||||
if(NOT CMAKE_CXX_STANDARD)
|
||||
- set(CMAKE_CXX_STANDARD 11)
|
||||
+ set(CMAKE_CXX_STANDARD 14)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
endif()
|
||||
|
||||
diff --git a/cmake/OpenCensusHelpers.cmake b/cmake/OpenCensusHelpers.cmake
|
||||
index 8fdfe96..53bc877 100644
|
||||
--- a/cmake/OpenCensusHelpers.cmake
|
||||
|
|
|
@ -13,7 +13,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
|||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS ${FEATURE_OPTIONS}
|
||||
)
|
||||
|
||||
|
@ -21,6 +21,6 @@ vcpkg_cmake_install()
|
|||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
|
|
@ -1,18 +1,16 @@
|
|||
{
|
||||
"name": "opencensus-cpp",
|
||||
"version-date": "2021-08-26",
|
||||
"port-version": 1,
|
||||
"description": "OpenCensus is a toolkit for collecting application performance and behavior data. It currently includes an API for tracing and stats.",
|
||||
"homepage": "https://github.com/census-instrumentation/opencensus-cpp",
|
||||
"license": "Apache-2.0",
|
||||
"supports": "!windows",
|
||||
"dependencies": [
|
||||
"abseil",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
],
|
||||
"features": {
|
||||
|
|
|
@ -758,12 +758,6 @@ opencc:arm64-windows=fail
|
|||
# opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP.
|
||||
opencc:arm-uwp=fail
|
||||
opencc:x64-uwp=fail
|
||||
opencensus-cpp:arm64-windows=fail
|
||||
opencensus-cpp:x64-windows=fail
|
||||
opencensus-cpp:x64-windows-static=fail
|
||||
opencensus-cpp:x64-windows-static-md=fail
|
||||
opencensus-cpp:x86-windows=fail
|
||||
opencensus-cpp:x64-uwp=fail
|
||||
opencl:arm-uwp=fail
|
||||
opencl:x64-uwp=fail
|
||||
opencsg:arm-uwp=fail
|
||||
|
|
|
@ -5130,7 +5130,7 @@
|
|||
},
|
||||
"opencensus-cpp": {
|
||||
"baseline": "2021-08-26",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"opencl": {
|
||||
"baseline": "2.2",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "043d8a451b507daa585a8a716cf297421912d3d4",
|
||||
"version-date": "2021-08-26",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "1e0e908de8a31c22d295c1ad069e87ab2eb964b7",
|
||||
"version-date": "2021-08-26",
|
||||
|
|
Загрузка…
Ссылка в новой задаче