The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-22 10:37:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

[jaeger-client-cpp] Fix improper direct reference to the "installed" directory which fails when it has been redirected. (#11583)

Browse Source
This commit is contained in:
Billy O'Neal 2020-05-26 20:58:07 -07:00 committed by GitHub
parent 323cd68f5a
commit a5758c97d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/jaeger-client-cpp/CONTROL
View File

@ -1,6 +1,6 @@
Source: jaeger-client-cpp Source: jaeger-client-cpp
Version: 0.5.1 Version: 0.5.1-1
Build-Depends: nlohmann-json,thrift,yaml-cpp,opentracing Build-Depends: nlohmann-json,thrift,yaml-cpp,opentracing
Homepage: https://github.com/jaegertracing/jaeger-client-cpp Homepage: https://github.com/jaegertracing/jaeger-client-cpp
Description: C++ OpenTracing binding for Jaeger https://jaegertracing.io/ Description: C++ OpenTracing binding for Jaeger https://jaegertracing.io/
Supports: !arm64 Supports: !arm64

14
ports/jaeger-client-cpp/portfile.cmake
View File

@ -17,7 +17,7 @@ set(THRIFT_SOURCE_FILES agent.thrift jaeger.thrift sampling.thrift zipkincore.th
# Generate proxy/stubs for the input files # Generate proxy/stubs for the input files
foreach(THRIFT_SOURCE_FILE IN LISTS THRIFT_SOURCE_FILES) foreach(THRIFT_SOURCE_FILE IN LISTS THRIFT_SOURCE_FILES)
vcpkg_execute_required_process( vcpkg_execute_required_process(
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/installed/${TARGET_TRIPLET}/tools/thrift/thrift --gen cpp:no_skeleton -o "${SOURCE_PATH}/data" ${THRIFT_SOURCE_FILE} COMMAND ${CURRENT_INSTALLED_DIR}/tools/thrift/thrift --gen cpp:no_skeleton -o "${SOURCE_PATH}/data" ${THRIFT_SOURCE_FILE}
WORKING_DIRECTORY ${SOURCE_PATH}/thrift WORKING_DIRECTORY ${SOURCE_PATH}/thrift
LOGNAME jaeger-idl-${TARGET_TRIPLET} LOGNAME jaeger-idl-${TARGET_TRIPLET}
) )
@ -33,7 +33,7 @@ vcpkg_from_github(
REF 47fbf19aae2e48d59dd8335b6f2a1e1a99abba7f REF 47fbf19aae2e48d59dd8335b6f2a1e1a99abba7f
SHA512 a07e4d3e585c0f3e99aff6a662229f6beed8aef80fc6f7188629da38421bc49ab9effea479398e0d94e0a127bd931054ab332b38b73c2191bf75d4adfe5f6928 SHA512 a07e4d3e585c0f3e99aff6a662229f6beed8aef80fc6f7188629da38421bc49ab9effea479398e0d94e0a127bd931054ab332b38b73c2191bf75d4adfe5f6928
HEAD_REF master HEAD_REF master
PATCHES PATCHES
"fix-CMakeLists.patch" "fix-CMakeLists.patch"
) )
@ -41,14 +41,14 @@ vcpkg_from_github(
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA PREFER_NINJA
OPTIONS OPTIONS
-DHUNTER_ENABLED=0 -DHUNTER_ENABLED=0
-DBUILD_TESTING=0 -DBUILD_TESTING=0
-DJAEGERTRACING_PLUGIN=0 -DJAEGERTRACING_PLUGIN=0
-DJAEGERTRACING_BUILD_EXAMPLES=0 -DJAEGERTRACING_BUILD_EXAMPLES=0
) )
# Copy generated files over to jaeger-client-cpp # Copy generated files over to jaeger-client-cpp
file(GLOB IDL_SOURCE_FILES LIST_DIRECTORIES false ${IDL_SOURCE_DIR}/*) file(GLOB IDL_SOURCE_FILES LIST_DIRECTORIES false ${IDL_SOURCE_DIR}/*)
file(COPY ${IDL_SOURCE_FILES} DESTINATION ${SOURCE_PATH}/src/jaegertracing/thrift-gen) file(COPY ${IDL_SOURCE_FILES} DESTINATION ${SOURCE_PATH}/src/jaegertracing/thrift-gen)