]> git.proxmox.com Git - ceph.git/blob - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/nethost/0001-nethost-cmakelists.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / nethost / 0001-nethost-cmakelists.patch
1 diff --git a/src/installer/corehost/cli/common.cmake b/src/installer/corehost/cli/common.cmake
2 index 63e7306..639c90e 100644
3 --- a/src/installer/corehost/cli/common.cmake
4 +++ b/src/installer/corehost/cli/common.cmake
5 @@ -5,9 +5,6 @@
6 project(${DOTNET_PROJECT_NAME})
7
8 if(WIN32)
9 - add_compile_options($<$<CONFIG:RelWithDebInfo>:/MT>)
10 - add_compile_options($<$<CONFIG:Release>:/MT>)
11 - add_compile_options($<$<CONFIG:Debug>:/MTd>)
12 else()
13 add_compile_options(-fvisibility=hidden)
14 endif()
15 diff --git a/src/installer/corehost/cli/nethost/CMakeLists.txt b/src/installer/corehost/cli/nethost/CMakeLists.txt
16 index 7473958..49c664f 100644
17 --- a/src/installer/corehost/cli/nethost/CMakeLists.txt
18 +++ b/src/installer/corehost/cli/nethost/CMakeLists.txt
19 @@ -2,12 +2,14 @@
20 # The .NET Foundation licenses this file to you under the MIT license.
21 # See the LICENSE file in the project root for more information.
22
23 -cmake_minimum_required (VERSION 2.6)
24 +cmake_minimum_required (VERSION 3.14)
25 project(nethost)
26
27 set(DOTNET_PROJECT_NAME "nethost")
28
29 # Include directories
30 +include(../../../settings.cmake)
31 +include(../../../functions.cmake)
32 include_directories(../fxr)
33
34 # CMake does not recommend using globbing since it messes with the freshness checks
35 @@ -22,13 +24,18 @@ if(WIN32)
36 Exports.def)
37 endif()
38
39 +if(BUILD_SHARED_LIBS)
40 include(../lib.cmake)
41 +else()
42 include(../lib_static.cmake)
43 +endif()
44
45 add_definitions(-DFEATURE_LIBHOST=1)
46 add_definitions(-DNETHOST_EXPORT)
47
48 -install(FILES nethost.h DESTINATION corehost)
49 -install(TARGETS nethost DESTINATION corehost)
50 -install(TARGETS libnethost DESTINATION corehost)
51 -install_symbols(nethost corehost)
52 \ No newline at end of file
53 +install(FILES nethost.h ../coreclr_delegates.h ../hostfxr.h DESTINATION include)
54 +if(BUILD_SHARED_LIBS)
55 +install(TARGETS nethost)
56 +else()
57 +install(TARGETS libnethost)
58 +endif()