mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 19:17:53 +08:00
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
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")
|
||
|
|
|