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

Jump to bottom

cmake: use latest FindPython*.cmake #29100

Merged
merged 3 commits into from Jul 21, 2019
Merged

cmake: use latest FindPython*.cmake #29100

merged 3 commits into from Jul 21, 2019

Conversation

tchaikov
Copy link
Contributor

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug

cbodley
cbodley approved these changes Jul 18, 2019
View reviewed changes
cmake/modules/FindPython.cmake Show resolved Hide resolved
@tchaikov
Copy link
Contributor Author

jenkins, retest this please

@tchaikov tchaikov force-pushed the wip-cmake-python-osx branch 4 times, most recently from d2858bd to 7cc55b0 Compare July 19, 2019 13:13
@tchaikov
cmake: update FindPython* modules
5e2bd7f 
use the ones shiped from the latest cmake. which

* enables us to find the recent python intepreter and development files,
* find intepreter and development in a single `find_pacakge()` command,
  simpler this way and less error prone.

and to accomodate this change:

* all `PYTHON${PYTHON_VERSION}_*` variables are renamed to
  `Python${PYTHON_VERSION}_*` if we use `find_package(Python2...)` or
  `find_package(Python3...)` to find python2 or python3 instead of using
  `find_package(Python...)`.
* use "2" explicitly when using python2, as `Python_*` variables are not
  defined anymore
* when compiling python support of ceph-mgr, continue using `Python_*`
  variables. because we find the python interpreter and development
  files using `find_pacakge(Python...)` for ceph-mgr.

Signed-off-by: Kefu Chai <kchai@redhat.com>
@tchaikov
cmake: pass PYTHON_VERSION explicitly
606b9c1 
allow `distutils_*()` functions to choose the python according to this
parameter, instead of implicitly using the variable of ${PYTHON_VERSION}
inherited from the caller.

Signed-off-by: Kefu Chai <kchai@redhat.com>
@tchaikov
doc/dev/macos.rst: update to be in sync with master
79078f4 
* we've moved to cmake 3.5, so no need to hack for newer cmake
* nss dependency is dropped, no need to install it anymore
* pass clang and clang++ using cmake variable to be more consistent
* pass CMAKE_EXE_LINKER_FLAGS as `/usr/local/opt/llvm/lib` is
  not in default library paths.
* mention boostorg/atomic#15

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

https://shaman.ceph.com/builds/ceph/wip-cmake-python-kefu/79078f43e897fb46100e7418bdef5a5201e9240f/

@tchaikov tchaikov merged commit a1b9f60 into ceph:master Jul 21, 2019
@tchaikov tchaikov deleted the wip-cmake-python-osx branch July 21, 2019 01:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cbodley cbodley cbodley approved these changes

@gregsfortytwo gregsfortytwo Awaiting requested review from gregsfortytwo

Assignees
No one assigned
Labels
build/ops cleanup needs-qa
Projects
None yet
Milestone
No milestone
2 participants
@tchaikov @cbodley