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

cmake: search for Keyutils in default paths #12769

Merged
merged 1 commit into from Jan 5, 2017

Conversation

Projects
None yet
2 participants
@bachp
Contributor

bachp commented Jan 3, 2017

This makes it more portable

Signed-off-by: Pascal Bach pascal.bach@nextrem.ch

@@ -13,7 +13,7 @@ INCLUDE(CheckCXXSymbolExists)
# include dir
find_path(KEYUTILS_INCLUDE_DIR keyutils.h NO_DEFAULT_PATH PATHS
find_path(KEYUTILS_INCLUDE_DIR keyutils.h PATHS

This comment has been minimized.

@tchaikov

tchaikov Jan 4, 2017

Contributor

@bachp since by default, find_path() searches in /usr/include, could you remove it also?

This comment has been minimized.

@tchaikov

tchaikov Jan 4, 2017

Contributor

also, CheckCXXSymbolExists() is not used, maybe we can take this chance to remove INCLUDE(CheckCXXSymbolExists) at line 12 as well.

This comment has been minimized.

@bachp

bachp Jan 4, 2017

Contributor

@tchaikov I just did the minimal change to get it working. But I will do the other cleanups as soon later today. Is there a chance to get this backportet to the kraken branch later?

This comment has been minimized.

@tchaikov

tchaikov Jan 4, 2017

Contributor

@bachp to get this PR backported, you might need to create a tracker ticket and update its backport field with "kraken". then connect your commit with that ticket using the notation of "Fixes: http://tracker.ceph.com/issues/12345" in your commit message.

This comment has been minimized.

@bachp

bachp Jan 4, 2017

Contributor

@tchaikov I update the PR however I was not able to test it as I don't have access to the machine I did the build at the moment.

This comment has been minimized.

@tchaikov

tchaikov Jan 4, 2017

Contributor

@bachp no worries. i will test your patch tomorrow in my build machine.

@tchaikov tchaikov added the build/ops label Jan 4, 2017

cmake: search for Keyutils in default paths and cleanup
This makes it more portable

Remove /usr/include as it is searched by find_path anyway.
Remove unnecessary include that weren't used.


Signed-off-by: Pascal Bach <pascal.bach@nextrem.ch>

@tchaikov tchaikov self-assigned this Jan 4, 2017

@tchaikov tchaikov added the cleanup label Jan 5, 2017

@tchaikov tchaikov merged commit 752ef9b into ceph:master Jan 5, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment