Skip to content

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

Merged
cbodley merged 2 commits intoceph:masterfrom
cbodley:wip-cmake-spawn-options
Feb 3, 2021
Merged

cmake/rgw: forward spawn's compile options to rgw_common object library#39279
cbodley merged 2 commits intoceph:masterfrom
cbodley:wip-cmake-spawn-options

Conversation

@cbodley
Copy link
Contributor

@cbodley cbodley commented Feb 3, 2021

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

Fixes: https://tracker.ceph.com/issues/48963

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug

Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

targets that depend on spawn via target_link_libraries() automatically
pull in their compile options and include directories

Signed-off-by: Casey Bodley <cbodley@redhat.com>
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>
Copy link
Contributor

@adamemerson adamemerson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hooray!

@cbodley cbodley merged commit 8422761 into ceph:master Feb 3, 2021
@cbodley cbodley deleted the wip-cmake-spawn-options branch February 3, 2021 22:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants