]> git.proxmox.com Git - ceph.git/blob - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/bond/fix-install-path.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / bond / fix-install-path.patch
1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index f2f8eaa..1b0c01c 100644
3 --- a/CMakeLists.txt
4 +++ b/CMakeLists.txt
5 @@ -23,7 +23,7 @@ set (BOND_FIND_RAPIDJSON
6 # settings so that we don't apply our settings to third-party code.
7 add_subdirectory (thirdparty)
8
9 -enable_testing()
10 +#enable_testing()
11
12 set (BOND_IDL ${CMAKE_CURRENT_SOURCE_DIR}/idl)
13 set (BOND_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/cpp/inc)
14 @@ -85,6 +85,6 @@ if (BOND_GBC_PATH)
15
16 install (
17 FILES ${BOND_GBC_PATH}
18 - DESTINATION bin
19 + DESTINATION tools
20 RENAME ${INSTALLED_GBC_NAME})
21 endif()
22 diff --git a/compiler/CMakeLists.txt b/compiler/CMakeLists.txt
23 index 1dff9d0..9a11575 100644
24 --- a/compiler/CMakeLists.txt
25 +++ b/compiler/CMakeLists.txt
26 @@ -108,7 +108,7 @@ set (test_sources
27 tests/TestMain.hs
28 ${tests})
29
30 -set (completion_dir etc/bash_completion.d)
31 +set (completion_dir tools/bond)
32 set (completion ${CMAKE_CURRENT_BINARY_DIR}/gbc.comp)
33 set (output ${CMAKE_CURRENT_BINARY_DIR}/build/gbc/gbc${CMAKE_EXECUTABLE_SUFFIX})
34 set (GBC_EXECUTABLE ${output} PARENT_SCOPE)
35 @@ -130,7 +130,7 @@ endif()
36
37 install (FILES ${output}
38 PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
39 - DESTINATION bin)
40 + DESTINATION ${completion_dir})
41
42 install (FILES ${completion}
43 RENAME gbc
44 diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
45 index b45078e..1eebe9c 100644
46 --- a/cpp/CMakeLists.txt
47 +++ b/cpp/CMakeLists.txt
48 @@ -110,7 +110,7 @@ target_include_directories (bond_apply BEFORE PRIVATE
49
50 install (TARGETS bond bond_apply
51 EXPORT bond
52 - ARCHIVE DESTINATION lib/bond
53 + ARCHIVE DESTINATION lib
54 INCLUDES DESTINATION include)
55
56 install (DIRECTORY ${BOND_IDL}/bond/core DESTINATION include/bond)