]> git.proxmox.com Git - ceph.git/blame - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/globjects/system-install.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / globjects / system-install.patch
CommitLineData
1e59de90
TL
1diff --git a/CMakeLists.txt b/CMakeLists.txt\r
2index 6556346..48ba95d 100644\r
3--- a/CMakeLists.txt\r
4+++ b/CMakeLists.txt\r
5@@ -42,11 +42,13 @@ include(cmake/GenerateTemplateExportHeader.cmake)\r
6 # \r
7 \r
8 # Get git revision\r
9+if(NOT DEFINED GIT_REV)\r
10 get_git_head_revision(GIT_REFSPEC GIT_SHA1)\r
11 string(SUBSTRING "${GIT_SHA1}" 0 12 GIT_REV)\r
12 if(NOT GIT_SHA1)\r
13 set(GIT_REV "0")\r
14 endif()\r
15+endif()\r
16 \r
17 # Meta information about the project\r
18 set(META_PROJECT_NAME "globjects")\r
19@@ -133,7 +135,7 @@ if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}" STREQU\r
20 endif()\r
21 \r
22 # Installation paths\r
23-if(UNIX AND SYSTEM_DIR_INSTALL)\r
24+if(1)\r
25 # Install into the system (/usr/bin or /usr/local/bin)\r
26 set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/<project>\r
27 set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share/<project>/cmake\r