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

cmake: fix paths to various EC source files #7748

Merged
merged 3 commits into from Feb 25, 2016
Merged

Conversation

alimaredia
Copy link
Contributor

Signed-off-by: Matt Benjamin mbenjamin@redhat.com

@alimaredia
Copy link
Contributor Author

@cbodley of the commits from PR 7740 (#7440) this is the only commit I can put into master ASAP. Can you take a look and merge it if you don't see any problems. I just built it.

#TODO:build libec_shec_neon library on an ARM machine
if(ARM_NEON OR ARM_NEON2)
set(shec_neon_srcs
${shec_srcs}
Copy link
Contributor

Choose a reason for hiding this comment

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

shec_srcs can be an OBJECT library to avoid compiling them separately for the ec_shec_generic and ec_shec_neon targets

include_directories(.)
include_directories(${CMAKE_SOURCE_DIR}/src/erasure-code/jerasure/jerasure/include)
include_directories(${CMAKE_SOURCE_DIR}/src/erasure-code/jerasure/gf-complete/include)
include_directories(${CMAKE_SOURCE_DIR}/src/erasure-code/jerasure)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@cbodley include_directories only applies to targets in a CMakeLists.txt, so I can either leave them as be or put them in erasure-code/CMakeLists.txt

Copy link
Contributor

Choose a reason for hiding this comment

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

ok, moving them to erasure-code/CMakeLists.txt sounds better

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
Signed-off-by: Ali Maredia <amaredia@redhat.com>
Signed-off-by: Ali Maredia <amaredia@redhat.com>
cbodley added a commit that referenced this pull request Feb 25, 2016
cmake: fix paths to various EC source files
@cbodley cbodley merged commit 0dd061c into master Feb 25, 2016
@tchaikov tchaikov deleted the wip-cmake-2-22-16 branch February 26, 2016 04:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants