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

More CMake package check fixes #6108

Merged
merged 2 commits into from Oct 13, 2015

Conversation

Projects
None yet
4 participants
@dang
Copy link
Contributor

dang commented Sep 29, 2015

These fix the check for yasm and the inclusions of gperftools. CMake now fails if yasm isn't installed, and the stub CPU profiler is used if gperftools wasn't found.

OUTPUT_QUIET)
if(no_yasm)
message("we do not have a modern/working yasm")
message(FATAL_ERROR "we do not have a modern/working yasm")

This comment has been minimized.

@liewegas

liewegas Sep 29, 2015

Member

is this really fatal? e.g., what about i386 or aarch64?

This comment has been minimized.

@dang

dang Sep 29, 2015

Author Contributor

Good question. Not having yasm is fatal. Probably this check is flawed.

This comment has been minimized.

@dang

dang Sep 29, 2015

Author Contributor

Okay, the checks (and builds) for this are broken in CMake, I'll fix them and update the pull request.

@tchaikov tchaikov added the build/ops label Sep 29, 2015

@dang dang force-pushed the wip-dang-cmake branch from ad0d008 to 33a24dc Sep 30, 2015

@dang

This comment has been minimized.

Copy link
Contributor Author

dang commented Sep 30, 2015

Okay, new version of the yasm checks that match what's in autotools right now, and should build both in the absence of yasm and on x86-32 and non-x86 targets.

@dang

This comment has been minimized.

Copy link
Contributor Author

dang commented Sep 30, 2015

This failure is in a unit test on an autotools build, so it appears to be unrelated.

@ghost

This comment has been minimized.

Copy link

ghost commented Sep 30, 2015

@dang it is indeed unrelated :-) It has been fixed with http://tracker.ceph.com/issues/13176 and it will disapear when infernalis is merged into hammer.

@tchaikov

This comment has been minimized.

Copy link
Contributor

tchaikov commented Oct 4, 2015

lgtm.

dang added some commits Sep 29, 2015

CMake - fix yasm check
The yasm check was incorrectly including yasm-build assembler files even
when yasm wasn't present.  Fix this, and make the output nicer.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
CMake - Fix perftools checks
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>

@dang dang force-pushed the wip-dang-cmake branch from 33a24dc to ff6223f Oct 5, 2015

tchaikov added a commit that referenced this pull request Oct 13, 2015

Merge pull request #6108 from ceph/wip-dang-cmake
More CMake package check fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>

@tchaikov tchaikov merged commit f1d2d08 into master Oct 13, 2015

@tchaikov tchaikov deleted the wip-dang-cmake branch Oct 13, 2015

@tchaikov tchaikov self-assigned this Oct 13, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.