diff --git a/ports/opentracing/portfile.cmake b/ports/opentracing/portfile.cmake index 9a6312e8f6..537b348ee7 100644 --- a/ports/opentracing/portfile.cmake +++ b/ports/opentracing/portfile.cmake @@ -16,16 +16,16 @@ vcpkg_from_github( repair_mojibake.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DENABLE_LINTING=OFF + -DBUILD_TESTING=OFF ${LOCAL_OPTIONS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OpenTracing) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenTracing) vcpkg_copy_pdbs() diff --git a/ports/opentracing/vcpkg.json b/ports/opentracing/vcpkg.json index 8061bc3d9c..e14d49d0ba 100644 --- a/ports/opentracing/vcpkg.json +++ b/ports/opentracing/vcpkg.json @@ -1,8 +1,19 @@ { "name": "opentracing", "version": "1.6.0", - "port-version": 2, + "port-version": 3, "description": "C++ implementation of the OpenTracing API", "homepage": "https://opentracing.io", - "supports": "!uwp" + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3dbf567ed4..fa419af52d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -923,8 +923,6 @@ openni2:x64-uwp=fail openni2:x64-windows-static=fail openscap:x64-linux=fail openscap:x64-osx=fail -opentracing:arm-uwp=fail -opentracing:x64-uwp=fail openvpn3:x64-osx=fail openvr:arm64-windows=fail openvr:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 3b39a14693..98854a003e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5182,7 +5182,7 @@ }, "opentracing": { "baseline": "1.6.0", - "port-version": 2 + "port-version": 3 }, "openvdb": { "baseline": "9.0.0", diff --git a/versions/o-/opentracing.json b/versions/o-/opentracing.json index 94c1d40af1..c8e944d7ac 100644 --- a/versions/o-/opentracing.json +++ b/versions/o-/opentracing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eae79381338436b815e727eb25885e6c8631eb5f", + "version": "1.6.0", + "port-version": 3 + }, { "git-tree": "6bd6797b313b265c51c85ea2838efcdaa70f87f7", "version": "1.6.0",