RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

debian/control: use yaml-dev >= 0.6

Browse Source 
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
This commit is contained in:
Deepika Upadhyay 2020-11-30 11:10:46 +00:00
parent 4b8c92a920
commit 1e6e1f907e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -62,7 +62,6 @@ Build-Depends: automake,
libudev-dev,
libnl-genl-3-dev,
libxml2-dev,
libyaml-cpp-dev,
librabbitmq-dev,
librdkafka-dev,
# Make-Check libxmlsec1,
@ -104,6 +103,7 @@ Build-Depends: automake,
# Make-Check xmlstarlet,
nasm [amd64],
zlib1g-dev,
Built-Using: libyaml-cpp-dev (>= 0.6),
Standards-Version: 4.4.0
Package: ceph

4
src/CMakeLists.txt
View File

@ -393,7 +393,9 @@ add_library(common-objs OBJECT ${libcommon_files})
if(WITH_JAEGER)
find_package(yaml-cpp 0.6.0)
if(NOT yaml-cpp_FOUND)
set(jaeger_libs ${CMAKE_BINARY_DIR}/external/lib/libyaml-cpp.so.0.6.2)
set(jaeger_libs ${CMAKE_BINARY_DIR}/external/lib/libyaml-cpp.so
${CMAKE_BINARY_DIR}/external/lib/libyaml-cpp.so.0.6
${CMAKE_BINARY_DIR}/external/lib/libyaml-cpp.so.0.6.2)
execute_process(COMMAND bash -c "grep -q 'yaml-cpp' debian/libjaeger.install || echo 'usr/lib/libyaml-cpp.so.*' >> debian/libjaeger.install"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
endif()