diff --git a/tools/nuget/opentelemetry-icon-color.png b/tools/nuget/opentelemetry-icon-color.png index c08946be7b..b7d769a828 100644 Binary files a/tools/nuget/opentelemetry-icon-color.png and b/tools/nuget/opentelemetry-icon-color.png differ diff --git a/tools/ports/benchmark/CONTROL b/tools/ports/benchmark/CONTROL index 4e522eb83d..b55440df46 100644 --- a/tools/ports/benchmark/CONTROL +++ b/tools/ports/benchmark/CONTROL @@ -1,5 +1,5 @@ -Source: benchmark -Version: 1.5.3 -Homepage: https://github.com/google/benchmark -Description: A library to support the benchmarking of functions, similar to unit-tests. -Supports: !(arm|uwp) +Source: benchmark +Version: 1.5.3 +Homepage: https://github.com/google/benchmark +Description: A library to support the benchmarking of functions, similar to unit-tests. +Supports: !(arm|uwp) diff --git a/tools/ports/benchmark/portfile.cmake b/tools/ports/benchmark/portfile.cmake index fdb988c538..9541b61def 100644 --- a/tools/ports/benchmark/portfile.cmake +++ b/tools/ports/benchmark/portfile.cmake @@ -1,46 +1,46 @@ -if (VCPKG_PLATFORM_TOOLSET STREQUAL "v140") - set(CMAKE_C_COMPILER cl.exe) - set(CMAKE_CXX_COMPILER cl.exe) - set(MSVC_TOOLSET_VERSION 140) -else() - # Make sure vs2019 compiled binaries are compat with vs2017 - set(VCPKG_CXX_FLAGS "/Zc:__cplusplus /d2FH4-") - set(VCPKG_C_FLAGS "/Zc:__cplusplus /d2FH4-") - set(PREFER PREFER_NINJA) -endif() - -#https://github.com/google/benchmark/issues/661 -vcpkg_fail_port_install(ON_TARGET "uwp") - -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO google/benchmark - REF c05843a9f622db08ad59804c190f98879b76beba # v1.5.3 - SHA512 4e4b793ff6d7a4b12ce4b98cf5faa6d5d27a0a1d7be630c0c4a2a4bca5168fd94585e5e3e1a9c43603e42145ddcded8e5a3688528bf073a068f53054b86ce774 - HEAD_REF master - PATCHES "version.patch" -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - ${PREFER} - OPTIONS - -DBENCHMARK_ENABLE_TESTING=OFF - -DCMAKE_DEBUG_POSTFIX=d -) - -vcpkg_install_cmake() - -vcpkg_copy_pdbs() - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/benchmark) - -vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +if (VCPKG_PLATFORM_TOOLSET STREQUAL "v140") + set(CMAKE_C_COMPILER cl.exe) + set(CMAKE_CXX_COMPILER cl.exe) + set(MSVC_TOOLSET_VERSION 140) +else() + # Make sure vs2019 compiled binaries are compat with vs2017 + set(VCPKG_CXX_FLAGS "/Zc:__cplusplus /d2FH4-") + set(VCPKG_C_FLAGS "/Zc:__cplusplus /d2FH4-") + set(PREFER PREFER_NINJA) +endif() + +#https://github.com/google/benchmark/issues/661 +vcpkg_fail_port_install(ON_TARGET "uwp") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/benchmark + REF c05843a9f622db08ad59804c190f98879b76beba # v1.5.3 + SHA512 4e4b793ff6d7a4b12ce4b98cf5faa6d5d27a0a1d7be630c0c4a2a4bca5168fd94585e5e3e1a9c43603e42145ddcded8e5a3688528bf073a068f53054b86ce774 + HEAD_REF master + PATCHES "version.patch" +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + ${PREFER} + OPTIONS + -DBENCHMARK_ENABLE_TESTING=OFF + -DCMAKE_DEBUG_POSTFIX=d +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/benchmark) + +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/tools/ports/protobuf/protobuf-targets-vcpkg-protoc.cmake b/tools/ports/protobuf/protobuf-targets-vcpkg-protoc.cmake index 245adf5608..149e6587ee 100644 --- a/tools/ports/protobuf/protobuf-targets-vcpkg-protoc.cmake +++ b/tools/ports/protobuf/protobuf-targets-vcpkg-protoc.cmake @@ -1,8 +1,8 @@ -# Create imported target protobuf::protoc -add_executable(protobuf::protoc IMPORTED) - -# Import target "protobuf::protoc" for configuration "Release" -set_property(TARGET protobuf::protoc APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(protobuf::protoc PROPERTIES - IMPORTED_LOCATION_RELEASE "${Protobuf_PROTOC_EXECUTABLE}" -) +# Create imported target protobuf::protoc +add_executable(protobuf::protoc IMPORTED) + +# Import target "protobuf::protoc" for configuration "Release" +set_property(TARGET protobuf::protoc APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(protobuf::protoc PROPERTIES + IMPORTED_LOCATION_RELEASE "${Protobuf_PROTOC_EXECUTABLE}" +) diff --git a/tools/ports/protobuf/vcpkg-cmake-wrapper.cmake b/tools/ports/protobuf/vcpkg-cmake-wrapper.cmake index 542a16c2b8..3cdf930128 100644 --- a/tools/ports/protobuf/vcpkg-cmake-wrapper.cmake +++ b/tools/ports/protobuf/vcpkg-cmake-wrapper.cmake @@ -1,16 +1,16 @@ -if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3) - cmake_policy(PUSH) - cmake_policy(SET CMP0057 NEW) - if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS) - if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") - set(Protobuf_USE_STATIC_LIBS ON) - else() - set(Protobuf_USE_STATIC_LIBS OFF) - endif() - endif() - cmake_policy(POP) -endif() - -find_program(Protobuf_PROTOC_EXECUTABLE NAMES protoc PATHS "${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/tools/protobuf" NO_DEFAULT_PATH) - -_find_package(${ARGS}) +if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3) + cmake_policy(PUSH) + cmake_policy(SET CMP0057 NEW) + if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS) + if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + set(Protobuf_USE_STATIC_LIBS ON) + else() + set(Protobuf_USE_STATIC_LIBS OFF) + endif() + endif() + cmake_policy(POP) +endif() + +find_program(Protobuf_PROTOC_EXECUTABLE NAMES protoc PATHS "${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/tools/protobuf" NO_DEFAULT_PATH) + +_find_package(${ARGS})