RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-26 21:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20324 from tchaikov/wip-cmake-build-boost

Browse Source 
cmake: fix the include dir for building boost::python

Reviewed-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
This commit is contained in:
Kefu Chai 2018-02-07 21:53:30 +08:00 committed by GitHub
commit 92495add10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/modules/BuildBoost.cmake
View File

@ -91,11 +91,13 @@ function(do_build_boost version)
" : ${CMAKE_CXX_COMPILER}"
" ;\n")
if(with_python GREATER -1)
set(python_ver ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
string(REPLACE ";" " " python_includes "${PYTHON_INCLUDE_DIRS}")
file(APPEND ${user_config}
"using python"
" : ${python_ver}"
" : ${PYTHON_EXECUTABLE}"
" : ${PYTHON_INCLUDE_DIRS}"
" : ${python_includes}"
" : ${PYTHON_LIBRARIES}"
" ;\n")
endif()
@ -107,7 +109,6 @@ function(do_build_boost version)
message(FATAL_ERROR "Please call find_package(PythonLibs) first for building "
"Boost.Python")
endif()
set(python_ver ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
list(APPEND b2 python=${python_ver})
endif()