From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 3 Feb 2021 20:17:19 +0000 (-0500)
Subject: cmake/rgw: forward spawn's compile options to rgw_common object library
X-Git-Tag: v17.1.0~3073^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F39279%2Fhead;p=ceph.git

cmake/rgw: forward spawn's compile options to rgw_common object library

since rgw_common is an OBJECT library, we can't use
target_link_libraries() for its dependency on spawn. we add its
include directories manually already with
$<TARGET_PROPERTY:spawn,INTERFACE_INCLUDE_DIRECTORIES>, but this didn't
pull in the compile definitions. this ultimately prevented the
WITH_BOOST_VALGRIND option from passing the BOOST_USE_VALGRIND
definition attached to boost::context

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index 12b42e4077f5..2de15201b5f8 100644
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -182,6 +182,8 @@ target_include_directories(rgw_common PRIVATE "${LUA_INCLUDE_DIR}")
 
 target_include_directories(rgw_common PRIVATE
   $<TARGET_PROPERTY:spawn,INTERFACE_INCLUDE_DIRECTORIES>)
+target_compile_definitions(rgw_common PRIVATE
+  $<TARGET_PROPERTY:spawn,INTERFACE_COMPILE_DEFINITIONS>)
 
 if(WITH_LTTNG)
   # rgw/rgw_op.cc includes "tracing/rgw_op.h"