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

fix the autotools and cmake build (the new fusestore needs libfuse) #7393

Merged
merged 5 commits into from Jan 28, 2016

Conversation

tchaikov
Copy link
Contributor

No description provided.

@tchaikov tchaikov force-pushed the wip-cmake branch 3 times, most recently from dd3eeb4 to 0f91ba9 Compare January 28, 2016 11:37
@tchaikov tchaikov changed the title fix the cmake build (the new fusestore needs libfuse) fix the autotools and cmake build (the new fusestore needs libfuse) Jan 28, 2016
as we've basically removed all the HyperTable code.

Signed-off-by: Kefu Chai <kchai@redhat.com>
@branch-predictor
Copy link
Contributor

Autotools part works for me regardless of whether --without-fuse is used or not.

Reviewed-by: Piotr Dałek piotr.dalek@ts.fujitsu.com

@tchaikov
Copy link
Contributor Author

@cbodley could you help review the cmake changes?

@branch-predictor has helped review, and tested the autotools changes.

@liewegas does this make sense to disable fusestore if libfuse-dev/fuse-devel is not installed?

* use ${FUSE_LIBRARIES} instead of "fuse" when referencing libfuse.
* do not compile FuseStore.cc if !HAVE_LIBFUSE.
* CMakeLists.txt: s/HAVE_FUSE/HAVE_LIBFUSE/, to match with the one
  defined for config.h.in.cmake, otherwise we need two vars:
  HAVE_LIBFUSE, and HAVE_FUSE

Signed-off-by: Kefu Chai <kchai@redhat.com>
* configure.ac: "#define HAVE_LIBFUSE" if libfuse is found
* os/Makefile.am: do not compile FuseStore.cc if libfuse is not found

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
@tchaikov
Copy link
Contributor Author

@cbodley as we discussed over irc, i dropped the change to Findfuse.cmake.

@liewegas
Copy link
Member

@tchaikov Yeah this makes sense. Sorry I missed this!

@cbodley
Copy link
Contributor

cbodley commented Jan 28, 2016

@tchaikov thanks. looks good on the cmake side 👍

tchaikov added a commit that referenced this pull request Jan 28, 2016
fix the autotools and cmake build (the new fusestore needs libfuse)

Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
@tchaikov tchaikov merged commit 2d75c9d into ceph:master Jan 28, 2016
@tchaikov tchaikov deleted the wip-cmake branch January 28, 2016 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants