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 changes #10391

Merged
merged 14 commits into from Jul 26, 2016
Merged

cmake changes #10391

merged 14 commits into from Jul 26, 2016

Conversation

tchaikov
Copy link
Contributor

No description provided.

@tchaikov
Copy link
Contributor Author

retest this please.

@@ -5,3 +5,11 @@ if(WITH_SUBMAN)
${CMAKE_CURRENT_SOURCE_DIR}/subman
DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/cron.hourly)
endif()

configure_file(
Copy link
Contributor Author

@tchaikov tchaikov Jul 22, 2016

Choose a reason for hiding this comment

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

@markhpc maybe you will like this!

libuuid dependency is not found in ceph.spec.in or debian/control.
and we are not using libuuid since 62bfc7a.

Signed-off-by: Kefu Chai <kchai@redhat.com>
use find_package_handle_standard_args() and remove unused bits.

Signed-off-by: Kefu Chai <kchai@redhat.com>
* use find_package_handle_standard_args() and remove unused bits.
* rename OPENLDAP_LIBS to OPENLDAP_LIBRARIES, to be consistent with
  find_package() modules.

Signed-off-by: Kefu Chai <kchai@redhat.com>
it is used by ceph.spec.in for installing subscription manager cron job
on rhel.

Signed-off-by: Kefu Chai <kchai@redhat.com>
following https://cmake.org/Wiki/RecipeAddUninstallTarget

Signed-off-by: Kefu Chai <kchai@redhat.com>
FindBacktrace.cmake is missing in older versions of cmake. so put a copy
in our tree.

Signed-off-by: Kefu Chai <kchai@redhat.com>
* we don't need the BABELTRACE_PATH_HINT setting, as packaging script
  requires the the babeltrace pacakges explicitly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
for example
```
include_directories(${LEVELDB_PREFIX}/include)
```
does not make sense if `LEVELDB_PREFIX` is not defined.

Signed-off-by: Kefu Chai <kchai@redhat.com>
* we used to check the header file of "aio.h" which is part of glibc,
  the glibc async i/o, and the corresponding library is librt. but what
  we are using is libaio.
* reference libaio using AIO_LIBRARIES for consistency.

Signed-off-by: Kefu Chai <kchai@redhat.com>
* remove unused bits
* fix the wrong mark_as_advanced() call.

Signed-off-by: Kefu Chai <kchai@redhat.com>
remove the crufts for handling the REQUIRED argument.

Signed-off-by: Kefu Chai <kchai@redhat.com>
remove unused bits

Signed-off-by: Kefu Chai <kchai@redhat.com>
this behaviour matches the autotools. and we should not enable profiling
unless asked to do so.

Fixes: http://tracker.ceph.com/issues/16804
Signed-off-by: Kefu Chai <kchai@redhat.com>
@alimaredia
Copy link
Contributor

@mdw-at-linuxbox could you look over the changes in FindOpenLdap.cmake?

as we don't need to compile the whole mds just for building the
libcephfs

Signed-off-by: Kefu Chai <kchai@redhat.com>
@alimaredia alimaredia merged commit 05e14bf into master Jul 26, 2016
@tchaikov tchaikov deleted the wip-cmake branch July 26, 2016 17:36
@wjwithagen
Copy link
Contributor

@tchaikov
Looks like this is a good reason to rebase. :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants