mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-01 04:39:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4f746bc664
vcpkg/ports/jaeger-client-cpp/fix-CMakeLists.patch

42 lines
1.4 KiB
Diff
Raw Normal View History

[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>
2020-05-13 07:22:58 +08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
[opentracing] Fix library linkage (#28606) * [opentracing] Fix library linkage * version * Fix linkage on Windows * version * simplify patch * version * Reduce patch * version
2023-03-18 04:02:58 +08:00
index 53e4598..4220910 100644
[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>
2020-05-13 07:22:58 +08:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
[h3/jaeger-client-cpp] Update to the latest version (#20008) * [h3/jaeger-client-cpp] Update to the latest version * Remove CONTROL files * Update version files * Update patch * Update versions/j-/jaeger-client-cpp.json
2021-09-08 23:00:54 +08:00
@@ -60,7 +60,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND
[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>
2020-05-13 07:22:58 +08:00
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()
[opentracing] Fix library linkage (#28606) * [opentracing] Fix library linkage * version * Fix linkage on Windows * version * simplify patch * version * Reduce patch * version
2023-03-18 04:02:58 +08:00
@@ -74,7 +74,7 @@ hunter_add_package(opentracing-cpp)
# OpenTracingConfig.cmake file
find_package(OpenTracing CONFIG REQUIRED)
# Under Windows, link dynamically with OpenTracing
-if (WIN32)
+if (TARGET OpenTracing::opentracing)
list(APPEND LIBS OpenTracing::opentracing)
set(OPENTRACING_LIB OpenTracing::opentracing)
else()
[h3/jaeger-client-cpp] Update to the latest version (#20008) * [h3/jaeger-client-cpp] Update to the latest version * Remove CONTROL files * Update version files * Update patch * Update versions/j-/jaeger-client-cpp.json
2021-09-08 23:00:54 +08:00
@@ -273,6 +273,9 @@ if(JAEGERTRACING_PLUGIN)
[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>
2020-05-13 07:22:58 +08:00
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
[h3/jaeger-client-cpp] Update to the latest version (#20008) * [h3/jaeger-client-cpp] Update to the latest version * Remove CONTROL files * Update version files * Update patch * Update versions/j-/jaeger-client-cpp.json
2021-09-08 23:00:54 +08:00
@@ -418,7 +421,7 @@ include(GNUInstallDirs)
[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>
2020-05-13 07:22:58 +08:00
# * <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")
Reference in New Issue Copy Permalink