diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-05-26 20:58:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 20:58:07 -0700 |
| commit | a5758c97d0481505436d43cd40af235098c8d481 (patch) | |
| tree | c4b3d5f3a1728b551ac6ff96a428796ff126494a | |
| parent | 323cd68f5a4ff65911ed68715a234f7f4603cf61 (diff) | |
| download | vcpkg-a5758c97d0481505436d43cd40af235098c8d481.tar.gz vcpkg-a5758c97d0481505436d43cd40af235098c8d481.zip | |
[jaeger-client-cpp] Fix improper direct reference to the "installed" directory which fails when it has been redirected. (#11583)
| -rw-r--r-- | ports/jaeger-client-cpp/CONTROL | 4 | ||||
| -rw-r--r-- | ports/jaeger-client-cpp/portfile.cmake | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ports/jaeger-client-cpp/CONTROL b/ports/jaeger-client-cpp/CONTROL index 399c48e85..6d6d47032 100644 --- a/ports/jaeger-client-cpp/CONTROL +++ b/ports/jaeger-client-cpp/CONTROL @@ -1,6 +1,6 @@ Source: jaeger-client-cpp -Version: 0.5.1 +Version: 0.5.1-1 Build-Depends: nlohmann-json,thrift,yaml-cpp,opentracing Homepage: https://github.com/jaegertracing/jaeger-client-cpp Description: C++ OpenTracing binding for Jaeger https://jaegertracing.io/ -Supports: !arm64
\ No newline at end of file +Supports: !arm64 diff --git a/ports/jaeger-client-cpp/portfile.cmake b/ports/jaeger-client-cpp/portfile.cmake index 1cf7b65fe..d56f5ec1c 100644 --- a/ports/jaeger-client-cpp/portfile.cmake +++ b/ports/jaeger-client-cpp/portfile.cmake @@ -17,7 +17,7 @@ set(THRIFT_SOURCE_FILES agent.thrift jaeger.thrift sampling.thrift zipkincore.th # Generate proxy/stubs for the input files foreach(THRIFT_SOURCE_FILE IN LISTS THRIFT_SOURCE_FILES) 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 LOGNAME jaeger-idl-${TARGET_TRIPLET} ) @@ -33,7 +33,7 @@ vcpkg_from_github( REF 47fbf19aae2e48d59dd8335b6f2a1e1a99abba7f SHA512 a07e4d3e585c0f3e99aff6a662229f6beed8aef80fc6f7188629da38421bc49ab9effea479398e0d94e0a127bd931054ab332b38b73c2191bf75d4adfe5f6928 HEAD_REF master - PATCHES + PATCHES "fix-CMakeLists.patch" ) @@ -41,14 +41,14 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS - -DHUNTER_ENABLED=0 - -DBUILD_TESTING=0 - -DJAEGERTRACING_PLUGIN=0 + OPTIONS + -DHUNTER_ENABLED=0 + -DBUILD_TESTING=0 + -DJAEGERTRACING_PLUGIN=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(COPY ${IDL_SOURCE_FILES} DESTINATION ${SOURCE_PATH}/src/jaegertracing/thrift-gen) |