Skip to content

Commit 7fcfe40

Browse files
authored
Merge pull request ceph#61592 from hasan4791/issue-69732
Isolate the absl flags to ceph-mon & ceph-nvmeof-monitor-client targets Reviewed-by: Radoslaw Zarzynski <[email protected]> Reviewed-by: Brad Hubbard <[email protected]>
2 parents 443c960 + 624640c commit 7fcfe40

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -316,12 +316,6 @@ endif(WITH_BLKIN)
316316

317317
if(WITH_JAEGER)
318318
find_package(thrift 0.13.0 REQUIRED)
319-
320-
if(EXISTS "/etc/redhat-release" OR EXISTS "/etc/fedora-release")
321-
# absl is installed as grpc build dependency on RPM based systems
322-
add_definitions(-DHAVE_ABSEIL)
323-
endif()
324-
325319
include(BuildOpentelemetry)
326320
build_opentelemetry()
327321
add_library(jaeger_base INTERFACE)
@@ -993,6 +987,12 @@ if(WITH_NVMEOF_GATEWAY_MONITOR_CLIENT)
993987
nvmeof/NVMeofGwMonitorClient.cc)
994988
add_executable(ceph-nvmeof-monitor-client ${ceph_nvmeof_monitor_client_srcs})
995989
add_dependencies(ceph-nvmeof-monitor-client ceph-common)
990+
# absl is installed as grpc build dependency on RPM based systems
991+
# Also isolate this flag to specific targets which needs this package
992+
if(EXISTS "/etc/redhat-release" OR EXISTS "/etc/fedora-release")
993+
target_compile_definitions(ceph-nvmeof-monitor-client PRIVATE HAVE_ABSEIL)
994+
target_compile_definitions(ceph-mon PRIVATE HAVE_ABSEIL)
995+
endif()
996996
target_link_libraries(ceph-nvmeof-monitor-client
997997
client
998998
mon

0 commit comments

Comments
 (0)