diff options
| author | Sönke Schau <xgcssch@users.noreply.github.com> | 2020-05-13 01:22:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-12 16:22:58 -0700 |
| commit | fa42722d56b4e9eb65bf4e23e32991895c759fe4 (patch) | |
| tree | 34e47cf953d764fb93b80adceb15b073f42e1c85 /ports/jaeger-client-cpp/fix-CMakeLists.patch | |
| parent | 663a898bca05426b13274b699256577aa6d9a0e7 (diff) | |
| download | vcpkg-fa42722d56b4e9eb65bf4e23e32991895c759fe4.tar.gz vcpkg-fa42722d56b4e9eb65bf4e23e32991895c759fe4.zip | |
[jaeger-client-cpp] New port (#9126)
* Initial commit
* Add missing files
* Add patchfile
* UWP Builds not supported
* Fix Linux version
* Removed 'include(vcpkg_common_functions)' as it is no longer needed
* Implemented proposed changes to portfile.cmake
* Further changes to portfile.cmake
* Added indicator that a failure is expected for arm64
* Added the expected failure on arm64 to ci.baseline.txt
* Combined two separate vcpkg_fail_port_install() calls
* Use upstream version compatible with opentracing 1.6
* Added 'Supports:' entry in CONTROL to signal missing arm64 support and removed vcpkg_fail_port_install() for UWP in portfile.cmake
Co-authored-by: xgcssch <soenke.schau@alte-leipziger.de>
Diffstat (limited to 'ports/jaeger-client-cpp/fix-CMakeLists.patch')
| -rw-r--r-- | ports/jaeger-client-cpp/fix-CMakeLists.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/ports/jaeger-client-cpp/fix-CMakeLists.patch b/ports/jaeger-client-cpp/fix-CMakeLists.patch new file mode 100644 index 000000000..e0e1b6c59 --- /dev/null +++ b/ports/jaeger-client-cpp/fix-CMakeLists.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5893f31..c8864fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,7 +59,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND + endif() + + hunter_add_package(thrift) +-find_package(thrift ${hunter_config} REQUIRED) ++find_package(Thrift CONFIG REQUIRED) + if(HUNTER_ENABLED) + list(APPEND LIBS thrift::thrift_static) + else() +@@ -268,6 +268,9 @@ if(JAEGERTRACING_PLUGIN) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/export.map + "{ global: OpenTracingMakeTracerFactory; local: *; };") + add_library(jaegertracing_plugin MODULE ${SRC}) ++ if (WIN32) ++ target_link_libraries(jaegertracing_plugin PUBLIC Iphlpapi Ws2_32) ++ endif() + add_lib_deps(jaegertracing_plugin) + target_link_libraries(jaegertracing_plugin PUBLIC + -static-libgcc +@@ -410,7 +413,7 @@ include(GNUInstallDirs) + # * <prefix>/lib*/cmake/<PROJECT-NAME> + # * <prefix>/lib*/ + # * <prefix>/include/ +-set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") ++set(config_install_dir "${CMAKE_INSTALL_DATAROOTDIR}/jaeger-client-cpp") + + set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") + |