Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMakeList.txt: Fix libraries for ceph_objectstore_tool #10149

Merged
merged 1 commit into from Jul 21, 2016

Conversation

wjwithagen
Copy link
Contributor

  • Does not require fuse
  • is CMAKE_DL_LIBS instead of dl

Submitted-by: Willem Jan Withagen wjw@digiware.nl

@@ -612,7 +612,7 @@ add_executable(ceph-objectstore-tool
tools/ceph_objectstore_tool.cc
tools/RadosDump.cc
$<TARGET_OBJECTS:common_util_obj>)
target_link_libraries(ceph-objectstore-tool osd os global ${Boost_PROGRAM_OPTIONS_LIBRARY} fuse dl)
target_link_libraries(ceph-objectstore-tool osd os global ${Boost_PROGRAM_OPTIONS_LIBRARY} ${CMAKE_DL_LIBS})
Copy link
Contributor

Choose a reason for hiding this comment

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

ceph-objectstore-tool supports FuseStore if `HAVE_LIBFUSE. in that case we need to link against fuse?

Copy link
Contributor

@tchaikov tchaikov Jul 6, 2016

Choose a reason for hiding this comment

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

could have a dedicated commit for s/dl/${CMAKE_DL_LIBS}/g

Copy link
Contributor Author

Choose a reason for hiding this comment

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

On 6-7-2016 10:54, Kefu Chai wrote:

In src/CMakeLists.txt
#10149 (comment):

@@ -612,7 +612,7 @@ add_executable(ceph-objectstore-tool
tools/ceph_objectstore_tool.cc
tools/RadosDump.cc
$<TARGET_OBJECTS:common_util_obj>)
-target_link_libraries(ceph-objectstore-tool osd os global ${Boost_PROGRAM_OPTIONS_LIBRARY} fuse dl)
+target_link_libraries(ceph-objectstore-tool osd os global ${Boost_PROGRAM_OPTIONS_LIBRARY} ${CMAKE_DL_LIBS})

ceph-objectstore-tool supports FuseStore if `HAVE_LIBFUSE. in that case
we need to link against fuse?

I grepped the code, and the only reference was |enable_disable_fuse|,
but there is more HAVE_FUSE parts in src/osd/*
So I guess we'd need to match a WITH_FUSE with the OSD building.

But I'll fix this fuse depedancy for ceph-objectstore-tool in this pull
first.

And the dl <> CMAKE_DL_LIBS fix was just because I was here anyways.
Most of the others are in the FreeBSD cmake changes.
Want me to take 'm out of there and make a separate pull?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tchaikov
Took the dl <> CMAKE_DL_LIBS into a separate pull #10317.

@wjwithagen
Copy link
Contributor Author

@tchaikov
Ping.

@tchaikov
Copy link
Contributor

tchaikov commented Jul 21, 2016

@wjwithagen, sorry, i missed this, could you rebase it against master? and it's good to merge. i think.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
@wjwithagen
Copy link
Contributor Author

@tchaikov
Due to the refactoring of all targets, this also needs to move to another place.
BTW, great work with the refactoring, much more intuitive.

@tchaikov tchaikov merged commit 88f383c into ceph:master Jul 21, 2016
@wjwithagen
Copy link
Contributor Author

@tchaikov
Thanx,
Care to also merge #10352??

@wjwithagen wjwithagen deleted the patch-12 branch January 4, 2017 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants