]> git.proxmox.com Git - ceph.git/blob - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/cppfs/cmake-export-fix.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / cppfs / cmake-export-fix.patch
1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index ea9fd15..c62c6fd 100644
3 --- a/CMakeLists.txt
4 +++ b/CMakeLists.txt
5 @@ -124,7 +124,7 @@ endif()
6 if((UNIX AND SYSTEM_DIR_INSTALL) OR OPTION_FORCE_SYSTEM_DIR_INSTALL)
7 # Install into the system (/usr/bin or /usr/local/bin)
8 set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/<project>
9 - set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share/<project>/cmake
10 + set(INSTALL_CMAKE "share/${project}") # /usr/[local]/share/<project>
11 set(INSTALL_EXAMPLES "share/${project}") # /usr/[local]/share/<project>
12 set(INSTALL_DATA "share/${project}") # /usr/[local]/share/<project>
13 set(INSTALL_BIN "bin") # /usr/[local]/bin
14 @@ -183,7 +183,7 @@ add_subdirectory(deploy)
15 install(FILES "${PROJECT_BINARY_DIR}/VERSION" DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
16
17 # Install cmake find script for the project
18 -install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev)
19 +# install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev)
20
21 # Install the project meta files
22 install(FILES AUTHORS DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
23 diff --git a/source/cppfs/CMakeLists.txt b/source/cppfs/CMakeLists.txt
24 index aa37eda..e8a59e0 100644
25 --- a/source/cppfs/CMakeLists.txt
26 +++ b/source/cppfs/CMakeLists.txt
27 @@ -283,7 +283,7 @@ perform_health_checks(
28
29 # Library
30 install(TARGETS ${target}
31 - EXPORT "${target}-export" COMPONENT dev
32 + EXPORT "${target}-config" COMPONENT dev
33 RUNTIME DESTINATION ${INSTALL_BIN} COMPONENT runtime
34 LIBRARY DESTINATION ${INSTALL_SHARED} COMPONENT runtime
35 ARCHIVE DESTINATION ${INSTALL_LIB} COMPONENT dev
36 @@ -302,8 +302,8 @@ install(DIRECTORY
37 )
38
39 # CMake config
40 -install(EXPORT ${target}-export
41 +install(EXPORT ${target}-config
42 NAMESPACE ${META_PROJECT_NAME}::
43 - DESTINATION ${INSTALL_CMAKE}/${target}
44 + DESTINATION ${INSTALL_CMAKE}
45 COMPONENT dev
46 )